Commit 0fd3c487 authored by Vitaly Lipatov's avatar Vitaly Lipatov

backported to M60P as 0.9.7-alt0.M60P.1 (with rpmbph script)

parents 2eea0cdd b5a7dbeb
......@@ -47,6 +47,11 @@ filter_out_installed_packages()
# copied from etersoft-build-utils/share/eterbuild/functions/rpmpkg
epm_install_names()
{
if [ -n "$non_interactive" ] ; then
epm_ni_install_names "$@"
return
fi
[ -z "$1" ] && return
case $PMTYPE in
apt-rpm|apt-dpkg)
......@@ -137,7 +142,7 @@ epm_install_files()
docmd $SUDO pkg_add $@
return ;;
pacman)
docmd $SUDO pacman -U $@
docmd $SUDO pacman -U --noconfirm $@
return ;;
slackpkg)
docmd $SUDO installpkg $@
......@@ -145,7 +150,7 @@ epm_install_files()
esac
# other systems can install file package via ordinary command
epm_install_names $@
epm_install_names "$@"
}
epm_print_install_command()
......@@ -187,11 +192,6 @@ epm_install()
[ -z "$files$names" ] && echo "Skip empty install list" && return 2
if [ -n "$non_interactive" ] ; then
epm_ni_install_names $names || return
else
epm_install_names $names || return
fi
epm_install_names $names || return
epm_install_files $files
}
......@@ -38,7 +38,7 @@ case $PMTYPE in
#return
;;
*)
epm_packages $pkg_filenames | grep "$pkg_filenames"
epm_packages | grep "$pkg_filenames"
;;
esac
......
......@@ -23,5 +23,5 @@ load_helper epm-packages
epm_query_package()
{
#showcmd grep --color "$pkg_filenames"
epm_packages | grep --color "$pkg_filenames"
pkg_filenames= epm_packages | grep --color "$pkg_filenames"
}
......@@ -23,11 +23,11 @@ load_helper epm-install
epm_simulate()
{
local CMD
[ -z "$pkg_filenames" ] && echo "Skip empty list" && return 0
[ -z "$pkg_filenames" ] && echo "Skip empty list" && return 2
local filenames="$(echo $pkg_filenames | filter_out_installed_packages)"
# FIXME: can't correct receive status 2 in mandriva?
[ -z "$filenames" ] && echo "All packages are already installed" && return 0 #&& return 2
[ -z "$filenames" ] && echo "All packages are already installed" && return 2
case $PMTYPE in
apt-rpm|apt-dpkg)
......
# This spec is backported to ALTLinux p6 automatically by rpmbph script. Do not edit it.
#
Name: eepm
Version: 0.9.6
Version: 0.9.7
Release: alt0.M60P.1
Summary: Etersoft EPM package manager
......@@ -47,9 +47,15 @@ with various distros.
%_bindir/distr_info
%changelog
* Mon Aug 06 2012 Vitaly Lipatov <lav@altlinux.ru> 0.9.6-alt0.M60P.1
* Tue Aug 07 2012 Vitaly Lipatov <lav@altlinux.ru> 0.9.7-alt0.M60P.1
- backport to ALTLinux p6 (by rpmbph script)
* Tue Aug 07 2012 Vitaly Lipatov <lav@altlinux.ru> 0.9.7-alt1
- epm: fix use epm_packages
- simulate: return 2 if have no work
- install: support --auto for install files too
- install: run pacman for files with --noconfirm
* Mon Aug 06 2012 Vitaly Lipatov <lav@altlinux.ru> 0.9.6-alt1
- query: default realization via epm package list
- simulate: it is ok to run with empty list
......
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