diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:25:48 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:25:48 +0000 |
| commit | 22b917c00b4907abd1023520a415756493c52a18 (patch) | |
| tree | 2ec3d9ca1ec65a1b9f5f52746c77a1dc095ca238 | |
| parent | 1c1f7fcaa1602cf51e4c1879fe111be88302b3a9 (diff) | |
| download | drakx-22b917c00b4907abd1023520a415756493c52a18.tar drakx-22b917c00b4907abd1023520a415756493c52a18.tar.gz drakx-22b917c00b4907abd1023520a415756493c52a18.tar.bz2 drakx-22b917c00b4907abd1023520a415756493c52a18.tar.xz drakx-22b917c00b4907abd1023520a415756493c52a18.zip | |
(chooseGroups) factorize !isUpgrade test
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 22cc0c2b0..5f29c4eab 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -574,13 +574,12 @@ sub chooseGroups { log::l("compssUsersChoice selected: ", join(', ', map { qq("$_->{path}|$_->{label}") } grep { $_->{selected} } @$compssUsers)); - #- do not try to deselect package (by default no groups are selected). if (!$o->{isUpgrade}) { + #- do not try to deselect package (by default no groups are selected). install::any::unselectMostPackages($o) if $unselect_all; - } - #- if no group have been chosen, ask for using base system only, or no X, or normal. - if (!$o->{isUpgrade} && !any { $_->{selected} } @$compssUsers) { - offer_minimal_options($o); + + #- 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; } 1; } |