summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-14 11:41:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-14 11:41:12 +0000
commit72bdefdb1c6cadc4481d9c15f7e1408dc8aaf041 (patch)
tree825c043473926e7a110aaa9db78b35d99fd3d218 /perl-install/install_steps.pm
parent3638fb314f9458f66244795b766e5fd0e341110e (diff)
downloaddrakx-72bdefdb1c6cadc4481d9c15f7e1408dc8aaf041.tar
drakx-72bdefdb1c6cadc4481d9c15f7e1408dc8aaf041.tar.gz
drakx-72bdefdb1c6cadc4481d9c15f7e1408dc8aaf041.tar.bz2
drakx-72bdefdb1c6cadc4481d9c15f7e1408dc8aaf041.tar.xz
drakx-72bdefdb1c6cadc4481d9c15f7e1408dc8aaf041.zip
move from compssList to rpmsrate
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm10
1 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index db92fb75e..1bc80e53b 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -263,17 +263,13 @@ 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));
- foreach (values %{$packages->{names}}) {
- pkgs::packageSetFlagSkip($_, 0);
- }
-
#- 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};
+ add2hash_($o, { compssListLevel => $::expert ? 5 : 4 }) unless $::auto_install;
+ pkgs::setSelectedFromCompssList($packages, $o->{compssUsersChoice}, $o->{compssListLevel}, $availableCorrected) if exists $o->{compssListLevel};
}
$availableCorrected;
@@ -428,7 +424,7 @@ Consoles 1,3,4,7 may also contain interesting information";
if ($o->{compssUsersChoice}{KDE} && -x "$o->{prefix}/usr/bin/kdm") {
log::l("setting desktop to KDE");
output($f, "KDE\n");
- } elsif ($o->{compssUsersChoice}{Gnome} && -x "$o->{prefix}/usr/bin/gdm") {
+ } elsif ($o->{compssUsersChoice}{GNOME} && -x "$o->{prefix}/usr/bin/gdm") {
log::l("setting desktop to GNOME");
output($f, "GNOME\n");
}