summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-02-14 13:10:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-02-14 13:10:37 +0000
commit5ca8baed3da1a4393caa36a9200b566100ce0f2f (patch)
treec0e929d8a8f0acd49dc06f8898ce6f9c2d42fc2a
parent0f897336460229074c0b895d8678bacba1f616c8 (diff)
downloadurpmi-5ca8baed3da1a4393caa36a9200b566100ce0f2f.tar
urpmi-5ca8baed3da1a4393caa36a9200b566100ce0f2f.tar.gz
urpmi-5ca8baed3da1a4393caa36a9200b566100ce0f2f.tar.bz2
urpmi-5ca8baed3da1a4393caa36a9200b566100ce0f2f.tar.xz
urpmi-5ca8baed3da1a4393caa36a9200b566100ce0f2f.zip
add option "-m" in usage (was already documented in manpage)
-rw-r--r--urpmi.bash-completion3
-rwxr-xr-xurpmq8
2 files changed, 5 insertions, 6 deletions
diff --git a/urpmi.bash-completion b/urpmi.bash-completion
index 00fde1f0..3bec9b53 100644
--- a/urpmi.bash-completion
+++ b/urpmi.bash-completion
@@ -174,12 +174,13 @@ _urpmq()
if [[ "$cur" == -* ]]; then
# return list of available options
- COMPREPLY=( $( compgen -W '-v -d -u -a -c -P -R -y -s -i -g \
+ COMPREPLY=( $( compgen -W '-v -d -u -m -a -c -y -s -i -g \
-r -f -h -l --help --update --media --excludemedia \
--sortmedia --synthesis --auto-select --fuzzy --keep --nokeep \
--list --list-url --list-media --list-nodes --list-aliases \
--src --sources --force --parallel --wget --curl --prozilla \
--changelog --proxy --proxy-user --env --dump-config \
+ --whatrequires --whatrequires-recursive \
--use-distrib --searchmedia --ignorearch' -- $cur))
else
# return available packages (unless it is clearly a file) and rpm files
diff --git a/urpmq b/urpmq
index 50f9efa5..b853f579 100755
--- a/urpmq
+++ b/urpmq
@@ -94,6 +94,7 @@ usage:
") . N(" -g - print groups with name also.
") . N(" -i - print useful information in human readable form.
") . N(" -l - list files in package.
+") . N(" -m - equivalent to -du
") . N(" -p - search in provides to find package.
") . N(" -r - print version and release with name also.
") . N(" -s - next package is a source package (same as --src).
@@ -277,14 +278,11 @@ if ($urpm::args::options{list_aliases}) {
exists $state->{selected}{$pkg->id} and next;
$state->{selected}{$pkg->id} = undef;
+ next if !$requested{$dep} && !$urpm::args::options{what_requires_recursive};
+
#- for all provides of package, look up what is requiring them.
foreach ($pkg->provides) {
if (my ($n, $s) = /^([^\s\[]*)(?:\[\*\])?\[?([^\s\]]*\s*[^\s\]]*)/) {
- #- NOTE. if the "provides" has no version specification, we happily
- #- assume that it can be skipped, because it most probably refers
- #- to a virtual package.
- next if $s eq '' && !$urpm::args::options{what_requires_recursive};
-
if (keys %{$urpm->{provides}{$n}} > 1) {
#- If more than one thing provides this requirement
#- then don't bother finding stuff