Skip to content

E
eepm
Commit 7292e302 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

epm-install: fall to standalone apt install for fix deps

parent 1f554efb
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
bin/epm-install
View file @ 7292e302
...@@ -55,13 +55,13 @@ epm_install_names() ...@@ -55,13 +55,13 @@ epm_install_names()
[ -z "$1" ] && return [ -z "$1" ] && return
case $PMTYPE in case $PMTYPE in
apt-rpm|apt-dpkg) apt-rpm|apt-dpkg)
sudocmd apt-get install $@ sudocmd apt-get $APTOPTIONS install $@
return ;; return ;;
deepsolver-rpm) deepsolver-rpm)
sudocmd ds-install $@ sudocmd ds-install $@
return ;; return ;;
urpm-rpm) urpm-rpm)
sudocmd urpmi $@ sudocmd urpmi $URPMOPTIONS $@
return ;; return ;;
pkg_add) pkg_add)
sudocmd pkg_add -r $@ sudocmd pkg_add -r $@
...@@ -79,7 +79,7 @@ epm_install_names() ...@@ -79,7 +79,7 @@ epm_install_names()
sudocmd dnf install $@ sudocmd dnf install $@
return ;; return ;;
zypper-rpm) zypper-rpm)
sudocmd zypper install $@ sudocmd zypper install $ZYPPEROPTIONS $@
return ;; return ;;
mpkg) mpkg)
sudocmd mpkg install $@ sudocmd mpkg install $@
...@@ -100,7 +100,7 @@ epm_ni_install_names() ...@@ -100,7 +100,7 @@ epm_ni_install_names()
[ -z "$1" ] && return [ -z "$1" ] && return
case $PMTYPE in case $PMTYPE in
apt-rpm|apt-dpkg) apt-rpm|apt-dpkg)
sudocmd apt-get -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install $@ sudocmd apt-get -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" $APTOPTIONS install $@
return ;; return ;;
yum-rpm) yum-rpm)
sudocmd yum -y $YUMOPTIONS install $@ sudocmd yum -y $YUMOPTIONS install $@
...@@ -154,8 +154,12 @@ epm_install_files() ...@@ -154,8 +154,12 @@ epm_install_files()
DPKGOPTIONS="--force-confdef --force-confold" DPKGOPTIONS="--force-confdef --force-confold"
fi fi
sudocmd dpkg $DPKGOPTIONS -i $@ sudocmd dpkg $DPKGOPTIONS -i $@
sudocmd apt-get -f install # if run with --nodeps, do not fallback on hi level
return ;;
[ -n "$nodeps" ] && return
# fall to apt-get -f install for fix deps
APTOPTIONS="-f"
;;
yum-rpm|dnf-rpm) yum-rpm|dnf-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