Commit c6ac1c06 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm-remove: use hi level removing with any error on low level (closes #236)

parent 2b879737
......@@ -170,7 +170,7 @@ __epm_get_hilevel_name()
local pkg
# get short form in pkg
# FIXME: where we use it? continue or pkg=$i?
quiet=1 pkg=$(__epm_query_shortname "$i") || pkg="$i" #continue # drop not installed packages
quiet=1 pkg=$(__epm_query_shortname "$i" 2>/dev/null) || pkg="$i" #continue # drop not installed packages
# if already short form, skipped
[ "$pkg" = "$i" ] && echo "$i" && continue
# try get long form or use short form
......
......@@ -45,6 +45,9 @@ epm_remove_low()
cd /tmp || fatal
__epm_check_vendor $@
set_sudo
sudocmd rpm -ev $noscripts $nodeps $@
return
# we don't need RPMISNOTINSTALLED as for now
store_output sudocmd rpm -ev $noscripts $nodeps $@
# rpm returns number of packages if failed on removing
__check_rpm_e_result $RC_STDOUT $?
......@@ -363,7 +366,9 @@ epm_remove()
epm_remove_low $pkg_names && return
local STATUS=$?
if [ -n "$direct" ] || [ -n "$nodeps" ] || [ "$STATUS" = "$RPMISNOTINSTALLED" ]; then
# || [ "$STATUS" = "$RPMISNOTINSTALLED" ]
# see https://github.com/Etersoft/eepm/issues/236
if [ -n "$direct" ] || [ -n "$nodeps" ] ; then
[ -n "$force" ] || return $STATUS
fi
......
......@@ -117,8 +117,9 @@ __epm_check_vendor()
# it is missed package probably (package remove case)
if is_installed "$i" ; then
warning 'Can'\''t get any info for $i package. Scripts are DISABLED for package $bi. Use --scripts if you need run scripts from such packages.'
noscripts="--noscripts"
fi
noscripts="--noscripts"
# don't set --noscripts for non existent packages (will run scripts when remove by provides, see https://github.com/Etersoft/eepm/issues/236)
continue
fi
......
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