Commit 6e7c2ca0 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm install: add --replacepkgs (and --test for --dry-run case) to rpm -Uvh

parent b793c182
......@@ -268,7 +268,7 @@ epm_ni_install_names()
__epm_check_if_rpm_already_installed()
{
# Not: we can make optimize if just check version?
LANG=C sudorun rpm -Uvh "$@" 2>&1 | grep -q "is already installed"
LANG=C sudorun rpm -Uvh --test "$@" 2>&1 | grep -q "is already installed"
}
__handle_direct_install()
......@@ -339,10 +339,11 @@ epm_install_files()
__epm_check_if_needed_repack $files
fi
sudocmd rpm -Uvh $force $noscripts $nodeps $files && save_installed_packages $files && return
# --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 RES=$?
# 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 $noscripts $nodeps $files && return
# if run with --nodeps, do not fallback on hi level
[ -n "$nodeps" ] && return $RES
......@@ -359,7 +360,8 @@ epm_install_files()
# TODO: can we install only requires via apt?
epm install $(epm req --short $files) || return
# retry with rpm
sudocmd rpm -Uvh $force $noscripts $nodeps $files && save_installed_packages $files
# --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
fi
......@@ -445,10 +447,11 @@ epm_install_files()
__epm_check_if_src_rpm $files
sudocmd rpm -Uvh $force $noscripts $nodeps $files && return
# --replacepkgs: Install the Package Even If Already Installed
sudocmd rpm -Uvh --replacepkgs $(subst_option dryrun --test) $force $noscripts $nodeps $files && return
local RES=$?
__epm_check_if_rpm_already_installed $force $noscripts $nodeps $files && return
#__epm_check_if_rpm_already_installed $force $noscripts $nodeps $files && return
# if run with --nodeps, do not fallback on hi level
[ -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