Commit ebfe1bdb authored by Vitaly Lipatov's avatar Vitaly Lipatov

use $@ instead of pkg_filenames where possible

parent 0a9e4a9f
......@@ -25,7 +25,7 @@ __epm_orphan_altrpm()
epm_autoorphans()
{
[ -z "$pkg_filenames" ] || fatal "No arguments are allowed here"
[ -z "$*" ] || fatal "No arguments are allowed here"
case $PMTYPE in
......
......@@ -37,7 +37,7 @@ __remove_deb_apt_cache_file()
epm_clean()
{
[ -z "$pkg_filenames" ] || fatal "No arguments are allowed here"
[ -z "$*" ] || fatal "No arguments are allowed here"
case $PMTYPE in
......
......@@ -79,6 +79,7 @@ epm_downgrade()
local APTOPTIONS="$(subst_option non_interactive -y)"
__epm_add_alt_apt_downgrade_preferences || return
load_helper epm-upgrade
# pass pkg_filenames too
epm_upgrade "$@"
__epm_remove_apt_downgrade_preferences
;;
......
......@@ -190,40 +190,40 @@ epm_download()
case $DISTRNAME-$PMTYPE in
ALTLinux-apt-rpm)
__epm_download_alt $pkg_filenames
__epm_download_alt $*
return
;;
esac
case $PMTYPE in
dnf-rpm)
sudocmd dnf download $pkg_filenames
sudocmd dnf download $*
;;
aptcyg)
sudocmd apt-cyg download $pkg_filenames
sudocmd apt-cyg download $*
;;
packagekit)
docmd pkcon download $pkg_filenames
docmd pkcon download $*
;;
yum-rpm)
# TODO: check yum install --downloadonly --downloaddir=/tmp <package-name>
assure_exists yumdownloader yum-utils
sudocmd yumdownloader $pkg_filenames
sudocmd yumdownloader $*
;;
dnf-rpm)
sudocmd dnf download $pkg_filenames
sudocmd dnf download $*
;;
urpm-rpm)
sudocmd urpmi --no-install $URPMOPTIONS $@
;;
tce)
sudocmd tce-load -w $pkg_filenames
sudocmd tce-load -w $*
;;
opkg)
docmd opkg $pkg_filenames
docmd opkg $*
;;
homebrew)
docmd brew fetch $pkg_filenames
docmd brew fetch $*
;;
*)
fatal "Have no suitable command for $PMTYPE"
......
......@@ -35,8 +35,8 @@ epm_kernel_update()
fi
assure_exists update-kernel update-kernel 0.9.9
update_repo_if_needed
sudocmd update-kernel $(subst_option non_interactive -y) $pkg_filenames || return
docmd epm remove-old-kernels $(subst_option non_interactive -y) $pkg_filenames || fatal
sudocmd update-kernel $(subst_option non_interactive -y) "$@" || return
docmd epm remove-old-kernels $(subst_option non_interactive -y) "$@" || fatal
return ;;
esac
......
......@@ -32,7 +32,7 @@ __repack_rpm_base()
epm_optimize()
{
[ -z "$pkg_filenames" ] || fatal "No arguments are allowed here"
[ -z "$*" ] || fatal "No arguments are allowed here"
case $PMTYPE in
*-rpm)
......
......@@ -32,7 +32,7 @@ epm_remove_old_kernels()
return
fi
assure_exists update-kernel update-kernel 0.9.9
sudocmd remove-old-kernels $(subst_option non_interactive -y) $pkg_filenames
sudocmd remove-old-kernels $(subst_option non_interactive -y) "$@"
return ;;
Ubuntu)
load_helper epm-query_package
......@@ -52,7 +52,7 @@ epm_remove_old_kernels()
assure_exists purge-old-kernels byobu
;;
esac
sudocmd purge-old-kernels $pkg_filenames
sudocmd purge-old-kernels "$@"
return ;;
Gentoo)
sudocmd emerge -P gentoo-sources
......
......@@ -155,6 +155,8 @@ __fix_repo_to_basealt()
epm_repofix()
{
[ -z "$1" ] || fatal "No arguments are allowed here"
case $DISTRNAME in
ALTLinux)
assure_exists apt-repo
......@@ -180,8 +182,6 @@ case $DISTRNAME in
;;
esac
[ -z "$1" ] || fatal "No arguments are allowed here"
case $PMTYPE in
# apt-rpm)
# ;;
......
......@@ -70,8 +70,8 @@ epm_repolist()
case $PMTYPE in
apt-rpm)
#assure_exists apt-repo
if tasknumber "$pkg_names" >/dev/null ; then
get_task_packages $pkg_names
if tasknumber "$1" >/dev/null ; then
get_task_packages "$@"
else
print_apt_sources_list
#docmd apt-repo list
......
......@@ -24,8 +24,6 @@ epm_upgrade()
{
local CMD
#[ -z "$pkg_filenames" ] || fatal "No arguments are allowed here"
# it is useful for first time running
update_repo_if_needed
......
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