diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-11-16 17:33:03 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-11-16 17:33:03 +0000 |
| commit | e052c1ff2e8adf6ad0f2ce79b11a1b7d42e5a2ed (patch) | |
| tree | 2ee8caab20964a28cc1af5d1e3e21ef929e86080 | |
| parent | c013e0202043e38b175b40e759e93cc1da51f8f5 (diff) | |
| download | drakx-e052c1ff2e8adf6ad0f2ce79b11a1b7d42e5a2ed.tar drakx-e052c1ff2e8adf6ad0f2ce79b11a1b7d42e5a2ed.tar.gz drakx-e052c1ff2e8adf6ad0f2ce79b11a1b7d42e5a2ed.tar.bz2 drakx-e052c1ff2e8adf6ad0f2ce79b11a1b7d42e5a2ed.tar.xz drakx-e052c1ff2e8adf6ad0f2ce79b11a1b7d42e5a2ed.zip | |
(chooseGroups) fix offering "selecting individual packages" when
pressing "previous" after selecting package groups
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 890be3aae..1aee61891 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- fix offering "selecting individual packages" when pressing "previous" after + selecting package groups + Version 14.51 - 16 November 2012 - retrieve package descriptions from XML meta-data instead of from huge hdlists diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 65962ad33..142b87676 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -584,7 +584,9 @@ sub chooseGroups { install::any::unselectMostPackages($o) if $unselect_all; #- if no group have been chosen, ask for using base system only, or no X, or normal. - offer_minimal_options($o) if !any { $_->{selected} } @$compssUsers; + if (!any { $_->{selected} } @$compssUsers) { + offer_minimal_options($o) or goto &chooseGroups; + } } 1; } @@ -606,7 +608,7 @@ Please choose the minimal installation you want:"), { 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)") }, ], - ) or return &chooseGroups; + ) or return 0; if ($minimal) { $o->{rpmsrate_flags_chosen}{CAT_X} = $docs = $suggests = 0; @@ -619,6 +621,7 @@ Please choose the minimal installation you want:"), log::l("install settings: no_suggests=$o->{no_suggests}, excludedocs=$o->{excludedocs}, really_minimal_install=$minimal"); install::any::unselectMostPackages($o); + 1; } sub reallyChooseGroups { |