summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--urpm/args.pm6
-rwxr-xr-xurpmq4
3 files changed, 8 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 484dc396..eb760093 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
o rename 'no_suggests' parameter as 'no_recommends'
o rename '--allow-suggests' option as '--allow-recommends'
o rename '--no-suggests' option as '--no-recommends'
+ o rename '--suggests' option as '--recommends'
Version 7.32 - 5 September 2014
diff --git a/urpm/args.pm b/urpm/args.pm
index ccaa8e42..163caa62 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -266,9 +266,13 @@ my %options_spec = (
provides => \$options{provides},
sourcerpm => \$options{sourcerpm},
'summary|S' => \$options{summary},
+ recommends => sub {
+ $options{recommends} = 1;
+ },
suggests => sub {
$urpm->{error}("--suggests now displays the suggested packages, see --allow-suggests for previous behaviour");
- $options{suggests} = 1;
+ $urpm->{error}("You should now use --recommends.");
+ $options{recommends} = 1;
},
'list-media:s' => sub { $options{list_media} = $_[1] || 'all' },
'list-url' => \$options{list_url},
diff --git a/urpmq b/urpmq
index 05a078f5..396465be 100755
--- a/urpmq
+++ b/urpmq
@@ -81,7 +81,7 @@ sub usage() {
") . N(" --obsoletes - print obsoletes.
") . N(" --provides - print provides.
") . N(" --requires - print requires.
-") . N(" --suggests - print suggests.
+") . N(" --recommends - print recommends.
") . N(" --sourcerpm - print sourcerpm.
") . N(" --summary, -S - print summary.
") . N(" --verbose, -v - verbose mode.
@@ -502,7 +502,7 @@ if ($options{list_aliases}) {
}
}
exit $urpm::postponed_code;
- } elsif (my ($get) = grep { $options{$_} } 'provides', 'requires', 'conflicts', 'obsoletes', 'suggests') {
+ } elsif (my ($get) = grep { $options{$_} } 'provides', 'requires', 'conflicts', 'obsoletes', 'recommends') {
my @l = uniq_ { scalar $_->fullname } map { $urpm->{depslist}[$_] } map { split /\|/, $_ } keys %{$state->{selected}};
foreach my $pkg (@l) {
if (@l > 1) {