diff options
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 54023dd78..9325f506f 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- allow minimal install without suggests + Version 12.47 - 1 September 2009 - use https to grab mirrorlist from api.mandriva.com diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 39dc0cc7c..854862919 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -230,7 +230,7 @@ sub _resolve_requested_and_check { my ($packages, $state, $requested) = @_; my @l = $packages->resolve_requested($packages->{rpmdb}, $state, $requested, - callback_choices => \&packageCallbackChoices); + callback_choices => \&packageCallbackChoices, no_suggests => $::o->{no_suggests}); my $error; if (find { !exists $state->{selected}{$_} } keys %$requested) { diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index acdbb57d6..957a9da0e 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -569,6 +569,7 @@ sub chooseGroups { if (!$o->{isUpgrade} && !any { $_->{selected} } @$compssUsers) { my $docs = !$o->{excludedocs}; my $minimal; + my $suggests; $o->ask_from_({ title => N("Type of install"), message =>N("You have not selected any group of packages. @@ -577,6 +578,7 @@ Please choose the minimal installation you want:"), }, [ { val => \$o->{rpmsrate_flags_chosen}{CAT_X}, type => 'bool', text => N("With X"), disabled => sub { $minimal } }, + { val => \$suggests, type => 'bool', text => N("Install suggested packages"), disabled => sub { $minimal } }, { val => \$docs, type => 'bool', text => N("With basic documentation (recommended!)"), disabled => sub { $minimal } }, { val => \$minimal, type => 'bool', text => N("Truly minimal install (especially no urpmi)") }, ], @@ -588,6 +590,7 @@ Please choose the minimal installation you want:"), } $o->{excludedocs} = !$docs; $o->{rpmsrate_flags_chosen}{CAT_MINIMAL_DOCS} = $docs; + $o->{no_suggests} = !$suggests; install::any::unselectMostPackages($o); } |