Commit 7b5b8363 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm play: use improved --list on all rpm based distro

parent 8bf613b4
...@@ -142,8 +142,8 @@ __filter_by_installed_packages() ...@@ -142,8 +142,8 @@ __filter_by_installed_packages()
local tapt="$1" local tapt="$1"
local pkglist="$2" local pkglist="$2"
# hack for ALT # hack for rpm based
if [ "$BASEDISTRNAME" = "alt" ] ; then if [ "$PKGFORMAT" = "rpm" ] ; then
LC_ALL=C join -11 -21 $tapt $pkglist | uniq LC_ALL=C join -11 -21 $tapt $pkglist | uniq
return return
fi fi
...@@ -173,7 +173,7 @@ __get_installed_table() ...@@ -173,7 +173,7 @@ __get_installed_table()
pkglist="$(mktemp)" || fatal pkglist="$(mktemp)" || fatal
remove_on_exit $pkglist remove_on_exit $pkglist
if [ "$BASEDISTRNAME" = "alt" ] ; then if [ "$PKGFORMAT" = "rpm" ] ; then
__get_all_alt_repacked_packages | LC_ALL=C sort -u >$pkglist __get_all_alt_repacked_packages | LC_ALL=C sort -u >$pkglist
else else
epm --short packages | LC_ALL=C sort -u >$pkglist epm --short packages | LC_ALL=C sort -u >$pkglist
......
...@@ -223,20 +223,20 @@ epm_status_repacked() ...@@ -223,20 +223,20 @@ epm_status_repacked()
#is_installed $pkg || fatal "FIXME: implemented for installed packages as for now" #is_installed $pkg || fatal "FIXME: implemented for installed packages as for now"
case $BASEDISTRNAME in case $PKGFORMAT in
alt|redos|rosa*|mos|fedora) rpm)
epm_status_validate $pkg || return epm_status_validate $pkg || return
[ "$packager" = "EPM <support@etersoft.ru>" ] && return 0 [ "$packager" = "EPM <support@etersoft.ru>" ] && return 0
[ "$packager" = "EPM <support@eepm.ru>" ] && return 0 [ "$packager" = "EPM <support@eepm.ru>" ] && return 0
;; ;;
debian|ubuntu) deb)
epm_status_validate $pkg || return epm_status_validate $pkg || return
# In packages repackaged via alien maintainer equal to $USER, it is better to use the package description # In packages repackaged via alien maintainer equal to $USER, it is better to use the package description
[ ! -z "$repacked" ] && return 0 [ ! -z "$repacked" ] && return 0
;; ;;
*) *)
fatal 'Unsupported $BASEDISTRNAME' fatal 'epm_status_repacked: unsupported $PKGNAME ($BASEDISTRNAME)'
;; ;;
esac esac
return 1 return 1
......
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