diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | pod/urpmq.8.pod | 5 | ||||
| -rw-r--r-- | urpm/args.pm | 2 | ||||
| -rw-r--r-- | urpmi.bash-completion | 2 | ||||
| -rwxr-xr-x | urpmq | 6 |
5 files changed, 14 insertions, 3 deletions
@@ -3,6 +3,8 @@ - urpme: o enhance pkg list formatting for "The following packages contain %s: %s" error message (#29178) +- urpmq: + o add --no-suggests Version 5.2 - 18 January 2008, by Pascal "Pixel" Rigaux diff --git a/pod/urpmq.8.pod b/pod/urpmq.8.pod index 2cb4e876..f8bc6b99 100644 --- a/pod/urpmq.8.pod +++ b/pod/urpmq.8.pod @@ -84,6 +84,11 @@ searching packages and resolving dependencies. Select all packages that can be upgraded, according to already installed packages and packages listed in various registered media. +=item B<--no-suggests> + +With this option, urpmq will not require "suggested" packages. +By default, urpmq will require (newly) suggested packages. + =item B<--keep> When some dependencies cannot be satisfied, diff --git a/urpm/args.pm b/urpm/args.pm index 17f02ce0..d809ee9d 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -364,7 +364,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") +foreach my $k ("root=s", "nolock", "use-distrib=s", "skip=s", "prefer=s", "synthesis=s", 'suggests!') { $options_spec{urpmq}{$k} = $options_spec{urpmi}{$k}; } diff --git a/urpmi.bash-completion b/urpmi.bash-completion index 39578f13..84bd1072 100644 --- a/urpmi.bash-completion +++ b/urpmi.bash-completion @@ -174,7 +174,7 @@ _urpmq() # return list of available options COMPREPLY=( $( compgen -W "$common_options -d -u -m -a -c -y -s -i -g -p \ -r -f -l --update --media --excludemedia \ - --sortmedia --synthesis --auto-select --fuzzy --keep --nokeep \ + --sortmedia --synthesis --auto-select --no-suggests --fuzzy --keep --nokeep \ --list --list-url --list-media --list-nodes --list-aliases \ --src --sources --provides --summary --sourcerpm --force --parallel --wget --curl --prozilla \ --changelog --proxy --proxy-user --env --dump-config \ @@ -50,6 +50,7 @@ usage: ") . N(" --sortmedia - sort media according to substrings separated by comma. ") . N(" --synthesis - use the given synthesis instead of urpmi db. ") . N(" --auto-select - automatically select packages to upgrade the system. +") . N(" --no-suggests - do not auto select \"suggested\" packages. ") . N(" --fuzzy - impose fuzzy search (same as -y). ") . N(" --keep - keep existing packages if possible, reject requested packages that lead to removals. @@ -306,13 +307,16 @@ if ($options{list_aliases}) { keep => $options{keep}, rpmdb => $options{env} && "$options{env}/rpmdb.cz", auto_select => $options{auto_select}, + no_suggests => $urpm->{options}{'no-suggests'}, callback_choices => $stop_on_choices); $options{deps} or delete @{$state->{selected}}{grep { exists $state->{selected}{$_} && ! defined $state->{selected}{$_} } keys %{$state->{selected}}}; } elsif ($options{deps}) { #- only deps required. my $empty_db = new URPM; #- URPM has same methods as URPM::DB and empty URPM will be seen as empty URPM::DB. - $urpm->resolve_requested($empty_db, $state, \%requested, callback_choices => $stop_on_choices, nodeps => 1); + $urpm->resolve_requested($empty_db, $state, \%requested, + no_suggests => $urpm->{options}{'no-suggests'}, + callback_choices => $stop_on_choices, nodeps => 1); } else { $state->{selected} = \%requested; } |