diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | pod/urpmi.8.pod | 5 | ||||
| -rw-r--r-- | pod/urpmq.8.pod | 5 | ||||
| -rw-r--r-- | urpm/args.pm | 15 | ||||
| -rwxr-xr-x | urpmi | 1 |
5 files changed, 28 insertions, 2 deletions
@@ -1,3 +1,7 @@ +- urpmq: + o --suggests is currently misleading, introduce --allow-suggests and explain + the user that --suggests really means --allow-suggests (#39726) + Version 5.18 - 1 April 2008, by Pascal "Pixel" Rigaux - urpmi.addmedia, urpmi.update: diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod index 6a09104a..408f7001 100644 --- a/pod/urpmi.8.pod +++ b/pod/urpmi.8.pod @@ -191,6 +191,11 @@ Proposes a very verbose mode. With this option, urpmi will not install "suggested" packages. By default, urpmi will install (newly) suggested packages. +=item B<--allow-suggests> + +With this option, urpmi will install "suggested" packages. +This is useful if you have C<no-suggests> in urpmi.cfg. + =item B<--justdb> Update only the database, not the filesystem. diff --git a/pod/urpmq.8.pod b/pod/urpmq.8.pod index 9ac2fa94..fd266802 100644 --- a/pod/urpmq.8.pod +++ b/pod/urpmq.8.pod @@ -89,6 +89,11 @@ packages and packages listed in various registered media. With this option, urpmq will not require "suggested" packages. By default, urpmq will require (newly) suggested packages. +=item B<--allow-suggests> + +With this option, urpmi will install "suggested" packages. +This is useful if you have C<no-suggests> in urpmi.cfg. + =item B<--keep> When some dependencies cannot be satisfied, diff --git a/urpm/args.pm b/urpm/args.pm index d7acf2f8..83561845 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -111,7 +111,12 @@ my %options_spec = ( force => \$::force, justdb => \$options{justdb}, replacepkgs => \$options{replacepkgs}, - 'suggests!' => sub { $urpm->{options}{'no-suggests'} = !$_[1] }, + suggests => sub { + $urpm->{error}("option --suggests currently means --allow-suggests, but it may change"); + $urpm->{options}{'no-suggests'} = 0; + }, + 'allow-suggests' => sub { $urpm->{options}{'no-suggests'} = 0 }, + 'no-suggests' => sub { $urpm->{options}{'no-suggests'} = 1 }, 'allow-nodeps' => sub { $urpm->{options}{'allow-nodeps'} = 1 }, 'allow-force' => sub { $urpm->{options}{'allow-force'} = 1 }, 'parallel=s' => \$::parallel, @@ -242,6 +247,12 @@ my %options_spec = ( provides => \$options{provides}, sourcerpm => \$options{sourcerpm}, 'summary|S' => \$options{summary}, + suggests => sub { + $urpm->{error}("--suggests currently means --allow-suggests"); + $urpm->{options}{'no-suggests'} = 0; + }, + '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}, @@ -404,7 +415,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!') +foreach my $k ("root=s", "nolock", "use-distrib=s", "skip=s", "prefer=s", "synthesis=s", 'suggests', 'no-suggests', 'allow-suggests') { $options_spec{urpmq}{$k} = $options_spec{urpmi}{$k}; } @@ -106,6 +106,7 @@ usage: dependencies checking. ") . N(" --allow-force - allow asking user to install packages without dependencies checking and integrity. +") . N(" --allow-suggests - auto select \"suggested\" packages. ") . N(" --parallel - distributed urpmi across machines of alias. ") . N(" --root - use another root for rpm installation. ") . N(" --urpmi-root - use another root for urpmi db & rpm installation. |