summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-07-08 08:27:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-07-08 08:27:48 +0000
commit1fbb5fe17012f4b93ef6614f6088e830a8b2b430 (patch)
tree464c54f466e5d4354045a94a29483180555200d2
parentac6e5d5bc1958f7b1778104b6d2b76aaa74ade00 (diff)
downloadurpmi-1fbb5fe17012f4b93ef6614f6088e830a8b2b430.tar
urpmi-1fbb5fe17012f4b93ef6614f6088e830a8b2b430.tar.gz
urpmi-1fbb5fe17012f4b93ef6614f6088e830a8b2b430.tar.bz2
urpmi-1fbb5fe17012f4b93ef6614f6088e830a8b2b430.tar.xz
urpmi-1fbb5fe17012f4b93ef6614f6088e830a8b2b430.zip
- urpmq
o add --obsoletes
-rw-r--r--NEWS1
-rw-r--r--pod/urpmq.8.pod4
-rw-r--r--urpm/args.pm1
-rw-r--r--urpmi.bash-completion2
-rwxr-xr-xurpmq3
5 files changed, 9 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 84f2f55f..1a6a857e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
- urpmq:
o --suggests now displays the suggested packages, see --allow-suggests for
previous behaviour (#39726)
+ o add --obsoletes
Version 6.0 - 8 July 2008, by Pascal "Pixel" Rigaux
diff --git a/pod/urpmq.8.pod b/pod/urpmq.8.pod
index 4ccf565f..bf64ec83 100644
--- a/pod/urpmq.8.pod
+++ b/pod/urpmq.8.pod
@@ -217,6 +217,10 @@ Prints the package changelog.
Prints the package conflicts.
+=item B<--obsoletes>
+
+Prints the package obsoletes.
+
=item B<--provides>
Prints the package provides.
diff --git a/urpm/args.pm b/urpm/args.pm
index 5a41bf25..dc3db479 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -242,6 +242,7 @@ my %options_spec = (
list => \$options{list},
changelog => \$options{changelog},
conflicts => \$options{conflicts},
+ obsoletes => \$options{obsoletes},
provides => \$options{provides},
sourcerpm => \$options{sourcerpm},
'summary|S' => \$options{summary},
diff --git a/urpmi.bash-completion b/urpmi.bash-completion
index b466adb5..7d25a428 100644
--- a/urpmi.bash-completion
+++ b/urpmi.bash-completion
@@ -165,7 +165,7 @@ _urpmq()
--sortmedia --synthesis --auto-select --auto-orphans \
--no-suggests --fuzzy --keep --nokeep \
--list --list-url --list-media --list-nodes --list-aliases \
- --src --sources --provides --requires --suggests --summary --sourcerpm --force --parallel --wget --curl --prozilla \
+ --src --sources --provides --requires --obsoletes --suggests --summary --sourcerpm --force --parallel --wget --curl --prozilla \
--changelog --conflicts --proxy --proxy-user --env --dump-config \
--whatprovides --whatrequires --whatrequires-recursive \
--skip --prefer \
diff --git a/urpmq b/urpmq
index 47d7815f..7bca3691 100755
--- a/urpmq
+++ b/urpmq
@@ -80,6 +80,7 @@ usage:
") . N(" --env - use specific environment (typically a bug report).
") . N(" --changelog - print changelog.
") . N(" --conflicts - print conflicts.
+") . N(" --obsoletes - print obsoletes.
") . N(" --provides - print provides.
") . N(" --requires - print requires.
") . N(" --suggests - print suggests.
@@ -491,7 +492,7 @@ if ($options{list_aliases}) {
}
}
exit 0;
- } elsif (my ($get) = grep { $options{$_} } 'provides', 'requires', 'conflicts', 'suggests') {
+ } elsif (my ($get) = grep { $options{$_} } 'provides', 'requires', 'conflicts', 'obsoletes', 'suggests') {
my @l = uniq_ { scalar $_->fullname } map { $urpm->{depslist}[$_] } map { split /\|/, $_ } keys %{$state->{selected}};
foreach my $pkg (@l) {
if (@l > 1) {