summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-01-09 12:57:17 +0000
committerFrancois Pons <fpons@mandriva.com>2002-01-09 12:57:17 +0000
commit8e1302329799723ad368b9f662ba8111f67ea516 (patch)
tree43e4be4d0e268828692f8b089964c3fe29ff5986
parent2d4064be7e621ea2ce15e1e00a481631bc6106cf (diff)
downloaddrakx-8e1302329799723ad368b9f662ba8111f67ea516.tar
drakx-8e1302329799723ad368b9f662ba8111f67ea516.tar.gz
drakx-8e1302329799723ad368b9f662ba8111f67ea516.tar.bz2
drakx-8e1302329799723ad368b9f662ba8111f67ea516.tar.xz
drakx-8e1302329799723ad368b9f662ba8111f67ea516.zip
avoid asking for minimal install for upgrade.
-rw-r--r--perl-install/install_steps_interactive.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6f85ec76f..ac884662c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -652,7 +652,7 @@ sub chooseGroups {
log::l("compssUsersChoice: " . (!$val{$_} && "not ") . "selected [$_] as [$o->{compssUsers}{$_}{label}]") foreach keys %val;
#- if no group have been chosen, ask for using base system only, or no X, or normal.
- unless (grep { $val{$_} } keys %val) {
+ unless ($o->{isUpgrade} || grep { $val{$_} } keys %val) {
my $type;
#- search for what is currently selected.
@@ -671,7 +671,7 @@ Please choose the minimal installation you want"), [ __("Base system only"), __(
$o->{default_packages} = [];
$o->{compssUsersChoice}{$_} = 0 foreach keys %{$o->{compssUsersChoice}};
} else {
- install_any::setDefaultPackages($o);
+ install_any::setDefaultPackages($o, 'clean');
$o->{compssUsersChoice}{X} = $type eq __('With X');
}
install_any::unselectMostPackages($o);