diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | urpm/select.pm | 2 | ||||
| -rwxr-xr-x | urpmi | 2 | ||||
| -rwxr-xr-x | urpmq | 4 |
4 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,6 @@ +- rpm-4.12 support: + o rename 'no_suggests' parameter as 'no_recommends' + Version 7.32 - 5 September 2014 - add some missing methods, allows to do urpmf --qf '%sourcerpm:%requires' diff --git a/urpm/select.pm b/urpm/select.pm index 0b8ae3e5..79df74cc 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -308,7 +308,7 @@ installed or upgraded =item * nodeps -=item * no_suggests +=item * no_recommends =back @@ -468,7 +468,7 @@ if ($options{replacepkgs}) { install_src => $install_src, keep => $urpm->{options}{keep}, nodeps => $urpm->{options}{'allow-nodeps'} || $urpm->{options}{'allow-force'}, - no_suggests => $urpm->{options}{'no-suggests'}, + no_recommends => $urpm->{options}{'no-suggests'}, priority_upgrade => $test || $env ? '' : $urpm->{options}{'priority-upgrade'}, ); } @@ -365,7 +365,7 @@ 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'}, + no_recommends => $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}}}; @@ -373,7 +373,7 @@ if ($options{list_aliases}) { #- only deps required. my $empty_db = URPM->new; #- URPM has same methods as URPM::DB and empty URPM will be seen as empty URPM::DB. $urpm->resolve_requested($empty_db, $state, \%requested, - no_suggests => $urpm->{options}{'no-suggests'}, + no_recommends => $urpm->{options}{'no-suggests'}, callback_choices => $stop_on_choices, nodeps => 1); } else { $state->{selected} = \%requested; |