From 22b917c00b4907abd1023520a415756493c52a18 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 23 May 2012 18:25:48 +0000 Subject: (chooseGroups) factorize !isUpgrade test --- perl-install/install/steps_interactive.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'perl-install') 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; } -- cgit v1.2.1