Commit 9ffb65bf authored by Roman Alifanov's avatar Roman Alifanov Committed by Vitaly Lipatov

epm [remove, install]: new flag: manual_requires

parent d302482f
...@@ -147,6 +147,7 @@ force_yes= ...@@ -147,6 +147,7 @@ force_yes=
skip_installed= skip_installed=
skip_missed= skip_missed=
show_command_only= show_command_only=
manual_requires=
epm_cmd= epm_cmd=
warmup= warmup=
pkg_files= pkg_files=
...@@ -597,6 +598,9 @@ check_option() ...@@ -597,6 +598,9 @@ check_option()
--force-overwrite) # HELPOPT: force overwrite one package's file with another's file --force-overwrite) # HELPOPT: force overwrite one package's file with another's file
force_overwrite="--force-overwrite" force_overwrite="--force-overwrite"
;; ;;
--manual-requires) # HELPOPT: includes all package dependencies in the install/uninstall list
manual_requires="--manual-requires"
;;
-*) -*)
[ -n "$direct_args" ] && return 1 [ -n "$direct_args" ] && return 1
[ -n "$pkg_options" ] && pkg_options="$pkg_options $1" || pkg_options="$1" [ -n "$pkg_options" ] && pkg_options="$pkg_options $1" || pkg_options="$1"
...@@ -665,7 +669,7 @@ if [ -n "$quiet" ] ; then ...@@ -665,7 +669,7 @@ if [ -n "$quiet" ] ; then
fi fi
# fill # fill
export EPM_OPTIONS="$nodeps $force $verbose $debug $quiet $interactive $non_interactive $save_only $download_only $force_overwrite" export EPM_OPTIONS="$nodeps $force $verbose $debug $quiet $interactive $non_interactive $save_only $download_only $force_overwrite $manual_requires"
# if input is not console and run script from file, get pkgs from stdin too # if input is not console and run script from file, get pkgs from stdin too
if [ ! -n "$inscript" ] && [ -p /dev/stdin ] && [ "$EPMMODE" != "pipe" ] ; then if [ ! -n "$inscript" ] && [ -p /dev/stdin ] && [ "$EPMMODE" != "pipe" ] ; then
......
...@@ -22,6 +22,7 @@ load_helper epm-sh-install ...@@ -22,6 +22,7 @@ load_helper epm-sh-install
load_helper epm-query load_helper epm-query
load_helper epm-assure load_helper epm-assure
load_helper epm-repack load_helper epm-repack
load_helper epm-requires
load_helper epm-check_updated_repo load_helper epm-check_updated_repo
load_helper epm-sh-warmup load_helper epm-sh-warmup
...@@ -453,6 +454,10 @@ epm_install() ...@@ -453,6 +454,10 @@ epm_install()
fi fi
fi fi
if [ -n "$manual_requires" ] ; then
local pkg_names="$pkg_names $(short=1 epm_requires $pkg_names)"
fi
if [ -n "$show_command_only" ] ; then if [ -n "$show_command_only" ] ; then
# TODO: handle pkg_urls too # TODO: handle pkg_urls too
load_helper epm-install-print-command load_helper epm-install-print-command
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
load_helper epm-sh-altlinux load_helper epm-sh-altlinux
load_helper epm-query load_helper epm-query
load_helper epm-print load_helper epm-print
load_helper epm-requires
load_helper epm-sh-warmup load_helper epm-sh-warmup
load_helper epm-sh-install load_helper epm-sh-install
...@@ -308,6 +309,10 @@ epm_remove() ...@@ -308,6 +309,10 @@ epm_remove()
fi fi
fi fi
if [ -n "$manual_requires" ] ; then
local pkg_names="$pkg_names $(short=1 epm_requires $pkg_names)"
fi
# TODO: fix pkg_names override # TODO: fix pkg_names override
# get full package name(s) from the package file(s) # get full package name(s) from the package file(s)
[ -n "$pkg_files" ] && pkg_names="$pkg_names $(epm query $pkg_files)" [ -n "$pkg_files" ] && pkg_names="$pkg_names $(epm query $pkg_files)"
......
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