Commit f914e005 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm install: don't use --replacepkgs when install only one package

parent 3385ffe1
...@@ -345,10 +345,13 @@ epm_install_files() ...@@ -345,10 +345,13 @@ epm_install_files()
fi fi
# --replacepkgs: Install the Package Even If Already Installed # --replacepkgs: Install the Package Even If Already Installed
sudocmd rpm -Uvh --replacepkgs $(subst_option dryrun --test) $force $noscripts $nodeps $files && save_installed_packages $files && return local replacepkgs='--replacepkgs'
# don't use --replacepkgs when install only one file
[ -f "$files" ] && replacepkgs=''
sudocmd rpm -Uvh $replacepkgs $(subst_option dryrun --test) $force $noscripts $nodeps $files && save_installed_packages $files && return
local RES=$? local RES=$?
# TODO: check rpm result code and convert it to compatible format if possible # TODO: check rpm result code and convert it to compatible format if possible
#__epm_check_if_rpm_already_installed $force $noscripts $nodeps $files && return __epm_check_if_rpm_already_installed $force $replacepkgs $noscripts $nodeps $files && return
# if run with --nodeps, do not fallback on hi level # if run with --nodeps, do not fallback on hi level
[ -n "$nodeps" ] && return $RES [ -n "$nodeps" ] && return $RES
...@@ -366,7 +369,10 @@ epm_install_files() ...@@ -366,7 +369,10 @@ epm_install_files()
epm install $(epm req --short $files) || return epm install $(epm req --short $files) || return
# retry with rpm # retry with rpm
# --replacepkgs: Install the Package Even If Already Installed # --replacepkgs: Install the Package Even If Already Installed
sudocmd rpm -Uvh --replacepkgs $(subst_option dryrun --test) $force $noscripts $nodeps $files && save_installed_packages $files local replacepkgs='--replacepkgs'
# don't use --replacepkgs when install only one file
[ -f "$files" ] && replacepkgs=''
sudocmd rpm -Uvh $replacepkgs $(subst_option dryrun --test) $force $noscripts $nodeps $files && save_installed_packages $files
return return
fi fi
...@@ -453,10 +459,13 @@ epm_install_files() ...@@ -453,10 +459,13 @@ epm_install_files()
__epm_check_if_src_rpm $files __epm_check_if_src_rpm $files
# --replacepkgs: Install the Package Even If Already Installed # --replacepkgs: Install the Package Even If Already Installed
sudocmd rpm -Uvh --replacepkgs $(subst_option dryrun --test) $force $noscripts $nodeps $files && return local replacepkgs='--replacepkgs'
# don't use --replacepkgs when install only one file
[ -f "$files" ] && replacepkgs=''
sudocmd rpm -Uvh $replacepkgs $(subst_option dryrun --test) $force $noscripts $nodeps $files && return
local RES=$? local RES=$?
#__epm_check_if_rpm_already_installed $force $noscripts $nodeps $files && return __epm_check_if_rpm_already_installed $force $replacepkgs $noscripts $nodeps $files && return
# if run with --nodeps, do not fallback on hi level # if run with --nodeps, do not fallback on hi level
[ -n "$nodeps" ] && return $RES [ -n "$nodeps" ] && return $RES
......
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