summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-23 17:28:17 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-23 17:28:17 +0000
commit9042e7966ee4228e6d46d067b4341d73519871e5 (patch)
tree1b425aa18a7be833a555dcb997655ea1ace6ea35 /perl-install/install
parent9df9cd7d261c5c9c87597825251aa0259cce4e90 (diff)
downloaddrakx-9042e7966ee4228e6d46d067b4341d73519871e5.tar
drakx-9042e7966ee4228e6d46d067b4341d73519871e5.tar.gz
drakx-9042e7966ee4228e6d46d067b4341d73519871e5.tar.bz2
drakx-9042e7966ee4228e6d46d067b4341d73519871e5.tar.xz
drakx-9042e7966ee4228e6d46d067b4341d73519871e5.zip
(choosePackagesTree) honor "no suggests" option (mga#3467)
was not "implemented" for individual package selection when pterjan commited r259864 on Sep 2 2009: "allow minimal install without suggests"
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/steps_gtk.pm4
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3af26f0ec..f1b0a484e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- do not offer to upgrade mdv 201[1-9] (mga#5004)
- individual package selection:
o fix a crash
+ o honor "no suggests" option (mga#3467)
Version 14.9 - 23 April 2012
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 5d4936b67..dcd2cebbf 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -423,6 +423,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},
callback_choices => \&install::pkgs::packageCallbackChoices) :
$packages->disable_selected($packages->{rpmdb}, $state,
map { $packages->{depslist}[$_] } keys %l);
@@ -469,7 +470,8 @@ sub choosePackagesTree {
#- disable selection (or unselection).
$packages->{rpmdb} ||= install::pkgs::rpmDbOpen(); #- WORKAROUND
$isSelection ? $packages->disable_selected($packages->{rpmdb}, $state, @l) :
- $packages->resolve_requested($packages->{rpmdb}, $state, { map { $_->id => 1 } @l });
+ $packages->resolve_requested($packages->{rpmdb}, $state, { map { $_->id => 1 } @l },
+ no_suggests => $::o->{no_suggests});
} else {
#- keep the changes, update visible state.
foreach (@l) {