Commit 5e523df0 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm-install: try install with rpm before zypper use

parent febe6cd0
...@@ -109,7 +109,7 @@ epm_ni_install_names() ...@@ -109,7 +109,7 @@ epm_ni_install_names()
sudocmd urpmi --auto $URPMOPTIONS $@ sudocmd urpmi --auto $URPMOPTIONS $@
return ;; return ;;
zypper-rpm) zypper-rpm)
yes | sudocmd zypper --non-interactive install $@ yes | sudocmd zypper --non-interactive $ZYPPEROPTIONS install $@
return ;; return ;;
pkg_add) pkg_add)
sudocmd pkg_add -r $@ sudocmd pkg_add -r $@
...@@ -162,6 +162,14 @@ epm_install_files() ...@@ -162,6 +162,14 @@ epm_install_files()
YUMOPTIONS=--nogpgcheck YUMOPTIONS=--nogpgcheck
# use install_names # use install_names
;; ;;
zypper-rpm)
sudocmd rpm -Uvh $force $nodeps $@ && return
# if run with --nodeps, do not fallback on hi level
[ -n "$nodeps" ] && return
ZYPPEROPTIONS=--no-gpg-checks
# use install_names
;;
urpm-rpm) urpm-rpm)
sudocmd rpm -Uvh $force $nodeps $@ && return sudocmd rpm -Uvh $force $nodeps $@ && return
# if run with --nodeps, do not fallback on hi level # if run with --nodeps, do not fallback on hi level
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment