summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-07-08 07:58:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-07-08 07:58:05 +0000
commit896c30beccf1bff0a8acb1e78850eeae36419d28 (patch)
treef6a051dbaea28e5591bc1e1e75d5f7c50f24effc /urpm
parent501f41944fdaebbd649a7f9d12e9b58ee7c14eba (diff)
downloadurpmi-896c30beccf1bff0a8acb1e78850eeae36419d28.tar
urpmi-896c30beccf1bff0a8acb1e78850eeae36419d28.tar.gz
urpmi-896c30beccf1bff0a8acb1e78850eeae36419d28.tar.bz2
urpmi-896c30beccf1bff0a8acb1e78850eeae36419d28.tar.xz
urpmi-896c30beccf1bff0a8acb1e78850eeae36419d28.zip
- urpmq:
o --suggests now displays the suggested packages, see --allow-suggests for previous behaviour (#39726) - fixing duplicated setting of options in args.pm
Diffstat (limited to 'urpm')
-rw-r--r--urpm/args.pm11
1 files changed, 4 insertions, 7 deletions
diff --git a/urpm/args.pm b/urpm/args.pm
index 5b98d03a..5a41bf25 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -114,8 +114,7 @@ my %options_spec = (
justdb => \$options{justdb},
replacepkgs => \$options{replacepkgs},
suggests => sub {
- $urpm->{error}("option --suggests currently means --allow-suggests, but it may change");
- $urpm->{options}{'no-suggests'} = 0;
+ $urpm->{fatal}(1, "Use --allow-suggests instead of --suggests");
},
'allow-suggests' => sub { $urpm->{options}{'no-suggests'} = 0 },
'no-suggests' => sub { $urpm->{options}{'no-suggests'} = 1 },
@@ -247,11 +246,9 @@ my %options_spec = (
sourcerpm => \$options{sourcerpm},
'summary|S' => \$options{summary},
suggests => sub {
- $urpm->{error}("--suggests currently means --allow-suggests");
- $urpm->{options}{'no-suggests'} = 0;
+ $urpm->{error}("--suggests now displays the suggested packages, see --allow-suggests for previous behaviour");
+ $options{suggests} = 1;
},
- 'allow-suggests' => sub { $urpm->{options}{'no-suggests'} = 1 },
- 'no-suggests' => sub { $urpm->{options}{'no-suggests'} = 1 },
'list-media:s' => sub { $options{list_media} = $_[1] || 'all' },
'list-url' => \$options{list_url},
'list-nodes' => \$options{list_nodes},
@@ -415,7 +412,7 @@ foreach my $k ("help|h", "version", "no-locales", "test!", "force", "root=s", "u
{
$options_spec{urpme}{$k} = $options_spec{urpmi}{$k};
}
-foreach my $k ("root=s", "nolock", "use-distrib=s", "skip=s", "prefer=s", "synthesis=s", 'suggests', 'no-suggests', 'allow-suggests', 'auto-orphans')
+foreach my $k ("root=s", "nolock", "use-distrib=s", "skip=s", "prefer=s", "synthesis=s", 'no-suggests', 'allow-suggests', 'auto-orphans')
{
$options_spec{urpmq}{$k} = $options_spec{urpmi}{$k};
}