diff options
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 6 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 17372dd53..fe435d4f5 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - adapt to URPM-5 +- rename "no_suggests" option as "no_recommends" Version 16.42 - 18 September 2014 diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index a2afddbf5..b612b5282 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -292,9 +292,9 @@ sub _resolve_requested_and_check { my ($packages, $state, $requested) = @_; my @l = $packages->resolve_requested($packages->{rpmdb}, $state, $requested, - callback_choices => \&packageCallbackChoices, no_suggests => $::o->{no_suggests}); + callback_choices => \&packageCallbackChoices, no_recommends => $::o->{no_recommends}); - #- keep track of recommended packages so that theys could be unselected if the "no suggests" option is choosen later: + #- keep track of recommended packages so that theys could be unselected if the "no recommends" option is choosen later: if (!is_empty_hash_ref($state->{selected})) { my @new_ids = map { $packages->{depslist}[$_]->id } grep { $state->{selected}{$_}{recommended} } keys $state->{selected}; @recommended_package_ids = uniq(@recommended_package_ids, @new_ids); @@ -352,7 +352,7 @@ sub unselectAllPackages { foreach (@{$packages->{depslist}}) { my $to_select = $_->flag_base || $_->flag_installed && $_->flag_selected; # unselect recommended packages if minimal install: - if ($::o->{no_suggests} && member($_->id, @recommended_package_ids)) { + if ($::o->{no_recommends} && member($_->id, @recommended_package_ids)) { log::l("unselecting recommended package " . $_->name); undef $to_select; } diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index b78a25b48..615cb29df 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -432,7 +432,7 @@ sub choosePackagesTree { my $state = $packages->{state} ||= {}; $packages->{rpmdb} ||= install::pkgs::rpmDbOpen(); #- WORKAROUND my @l = $isSelection ? $packages->resolve_requested($packages->{rpmdb}, $state, \%l, - no_suggests => $::o->{no_suggests}, + no_recommends => $::o->{no_recommends}, callback_choices => \&install::pkgs::packageCallbackChoices) : $packages->disable_selected($packages->{rpmdb}, $state, map { $packages->{depslist}[$_] } keys %l); @@ -480,7 +480,7 @@ sub choosePackagesTree { $packages->{rpmdb} ||= install::pkgs::rpmDbOpen(); #- WORKAROUND $isSelection ? $packages->disable_selected($packages->{rpmdb}, $state, @l) : $packages->resolve_requested($packages->{rpmdb}, $state, { map { $_->id => 1 } @l }, - no_suggests => $::o->{no_suggests}); + no_recommends => $::o->{no_recommends}); } else { #- keep the changes, update visible state. foreach (@l) { diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index ca552ff14..e03cd2480 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -567,7 +567,7 @@ sub offer_minimal_options { my ($o) = @_; my $docs = !$o->{excludedocs}; state $minimal; - my $suggests = !$o->{no_suggests}; + my $suggests = !$o->{no_recommends}; $o->ask_from_({ title => N("Type of install"), message => N("You have not selected any group of packages. @@ -588,9 +588,9 @@ Please choose the minimal installation you want:"), } $o->{excludedocs} = !$docs; $o->{rpmsrate_flags_chosen}{CAT_MINIMAL_DOCS} = $docs; - $o->{no_suggests} = !$suggests; + $o->{no_recommends} = !$suggests; $o->{compssListLevel} = pkgs::rpmsrate_rate_max() if !$suggests; - log::l("install settings: no_suggests=$o->{no_suggests}, excludedocs=$o->{excludedocs}, really_minimal_install=$minimal"); + log::l("install settings: no_recommends=$o->{no_recommends}, excludedocs=$o->{excludedocs}, really_minimal_install=$minimal"); install::any::unselectMostPackages($o); 1; |