summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-07-07 14:58:27 +0000
committerFrancois Pons <fpons@mandriva.com>2000-07-07 14:58:27 +0000
commit7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5 (patch)
tree5fa035fa39c82ecf43220b4e96bb00fbe16fc9c6 /perl-install/install_steps.pm
parent7b975041ea5dfe72e19f00bbf1237f8e3cb3e7f3 (diff)
downloaddrakx-backup-do-not-use-7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5.tar
drakx-backup-do-not-use-7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5.tar.gz
drakx-backup-do-not-use-7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5.tar.bz2
drakx-backup-do-not-use-7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5.tar.xz
drakx-backup-do-not-use-7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm13
1 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 151d6f3fc..99d338c89 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -238,11 +238,16 @@ sub choosePackages {
pkgs::packageSetFlagSkip($_, 0);
pkgs::packageSetFlagUnskip($_, 0);
}
- pkgs::unselectAllPackages($packages);
- pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || next) foreach @{$o->{default_packages}};
- add2hash_($o, { compssListLevel => $::expert ? 90 : 80 }) unless $::auto_install;
- pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $o->{compssListLevel}, $availableCorrected, $o->{installClass}) if exists $o->{compssListLevel};
+ #- avoid destroying user selection of packages. TOCHECK
+ if ($first_time) {
+ pkgs::unselectAllPackages($packages);
+ pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || next) foreach @{$o->{default_packages}};
+
+ add2hash_($o, { compssListLevel => $::expert ? 90 : 80 }) unless $::auto_install;
+ pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $o->{compssListLevel}, $availableCorrected, $o->{installClass}) if exists $o->{compssListLevel};
+ }
+
$availableCorrected;
}