summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-01-31 17:34:18 +0000
committerFrancois Pons <fpons@mandriva.com>2001-01-31 17:34:18 +0000
commit406475c351c647dbf2c06b00c8ba94a78fb3aa0f (patch)
tree1ee8bbb6e0a2cb4686b8746a6bc99f5a23800302
parent63fceda1270f7f9fb45482dde847ec2d7bd0cefe (diff)
downloaddrakx-406475c351c647dbf2c06b00c8ba94a78fb3aa0f.tar
drakx-406475c351c647dbf2c06b00c8ba94a78fb3aa0f.tar.gz
drakx-406475c351c647dbf2c06b00c8ba94a78fb3aa0f.tar.bz2
drakx-406475c351c647dbf2c06b00c8ba94a78fb3aa0f.tar.xz
drakx-406475c351c647dbf2c06b00c8ba94a78fb3aa0f.zip
changed to clean selection for non expert as used for group selection
because it is not cleaned, need better solution TODO.
-rw-r--r--perl-install/install_steps.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 36b0626d9..608e90641 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -256,8 +256,9 @@ sub choosePackages {
my $availableCorrected = pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024);
log::l(sprintf "available size %dMB (corrected %dMB)", $available / sqr(1024), $availableCorrected / sqr(1024));
- #- avoid destroying user selection of packages. TOCHECK
- if ($first_time) {
+ #- avoid destroying user selection of packages but only
+ #- for expert, as they may have done individual selection before.
+ if ($first_time || !$::expert) {
pkgs::unselectAllPackages($packages);
pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || next) foreach @{$o->{default_packages}};