diff --git a/bin/epm-query b/bin/epm-query index a980a4a15e5cd1544e24944479551c00ae5a03a8..ee7f7fff1d0cfae4d7102083a3f612c4f1f4c16a 100644 --- a/bin/epm-query +++ b/bin/epm-query @@ -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 diff --git a/bin/epm-remove b/bin/epm-remove index 39ce6cf0a0c6f73c66a11c13ad777a732d6f8a54..9e4e6410b5be0fa5f62a3263a3dcc332195f419b 100644 --- a/bin/epm-remove +++ b/bin/epm-remove @@ -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 diff --git a/bin/epm-sh-install b/bin/epm-sh-install index 9dfc71bc6a12d915b9c536992bcdd72ae997ee1e..0f336e9a0b108d1d063f0abcf02fa7fbf7029f93 100644 --- a/bin/epm-sh-install +++ b/bin/epm-sh-install @@ -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