Commit 3f0fe9ad authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm install alt: cleanup

parent 240fa14d
...@@ -62,8 +62,12 @@ epm_install_files_alt() ...@@ -62,8 +62,12 @@ epm_install_files_alt()
# try install via apt if we could't install package file via rpm (we guess we need install requirements firsly) # try install via apt if we could't install package file via rpm (we guess we need install requirements firsly)
if [ -z "$noscripts" ] ; then
epm_install_names $files
return
fi
# TODO: use it always (apt can install version from repo instead of a file package) # TODO: use it always (apt can install version from repo instead of a file package)
if [ -n "$noscripts" ] ; then
info "Workaround for install packages via apt with --noscripts (see https://bugzilla.altlinux.org/44670)" info "Workaround for install packages via apt with --noscripts (see https://bugzilla.altlinux.org/44670)"
info "Firstly install package requrements …" info "Firstly install package requrements …"
# names of packages to be installed # names of packages to be installed
...@@ -78,8 +82,4 @@ epm_install_files_alt() ...@@ -78,8 +82,4 @@ epm_install_files_alt()
# --replacepkgs: Install the Package Even If Already Installed # --replacepkgs: Install the Package Even If Already Installed
local replacepkgs="$(__epm_get_replacepkgs $files)" local replacepkgs="$(__epm_get_replacepkgs $files)"
sudocmd rpm -Uvh $replacepkgs $(subst_option dryrun --test) $force $noscripts $nodeps $files && save_installed_packages $files sudocmd rpm -Uvh $replacepkgs $(subst_option dryrun --test) $force $noscripts $nodeps $files && save_installed_packages $files
return
fi
epm_install_names $files
} }
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