summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--urpm/args.pm4
-rwxr-xr-xurpmq7
3 files changed, 9 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index d0fd53d1..02a97067 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmq:
+ o --requires now display the raw requires, use --requires-recursive to get
+ the old behaviour (#29176)
- urpmf:
o fix mirrorlist handling
o fix fallback on hdlist when xml-info not found
diff --git a/urpm/args.pm b/urpm/args.pm
index 73665d9d..7505e1e0 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -245,8 +245,8 @@ my %options_spec = (
'parallel=s' => \$options{parallel},
'env=s' => \$options{env},
requires => sub {
- $urpm->{error}("option --requires is deprecated, use --requires-recursive instead");
- $options{deps} = 1;
+ $urpm->{error}("--requires behaviour changed, use --requires-recursive to get the old behaviour");
+ $options{requires} = 1;
},
'requires-recursive|d' => \$options{deps},
u => \$options{upgrade},
diff --git a/urpmq b/urpmq
index 448274a9..d7f3f21a 100755
--- a/urpmq
+++ b/urpmq
@@ -446,13 +446,14 @@ if ($options{list_aliases}) {
}
}
exit 0;
- } elsif ($options{provides}) {
+ } elsif ($options{provides} || $options{requires}) {
+ my $get = $options{provides} ? 'provides' : 'requires';
my @l = uniq_ { scalar $_->fullname } map { $urpm->{depslist}[$_] } map { split /\|/, $_ } keys %{$state->{selected}};
foreach my $pkg (@l) {
if (@l > 1) {
- printf "%s: %s\n", $pkg->name, $_ foreach $pkg->provides;
+ printf "%s: %s\n", $pkg->name, $_ foreach $pkg->$get;
} else {
- print "$_\n" foreach $pkg->provides;
+ print "$_\n" foreach $pkg->$get;
}
}
exit 0;