summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-12 15:10:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-12 15:10:31 +0000
commita33f6acea66267b5f1db65a588b67cb0468c5258 (patch)
tree5ea7ef5aa05d154bd934dc7765e0ad318627f603
parent27b200c3734cfe434c3764072168b08e75a76478 (diff)
downloaddrakx-a33f6acea66267b5f1db65a588b67cb0468c5258.tar
drakx-a33f6acea66267b5f1db65a588b67cb0468c5258.tar.gz
drakx-a33f6acea66267b5f1db65a588b67cb0468c5258.tar.bz2
drakx-a33f6acea66267b5f1db65a588b67cb0468c5258.tar.xz
drakx-a33f6acea66267b5f1db65a588b67cb0468c5258.zip
- do not propose "KDE, GNOME or Custom" profiles if the partition is small
(< 2.5GB) otherwise the installer will not be able to install the full profile eg: kdebase-konsole doesn't get installed with a 2GB "/" (where "available size corrected" is 1.3GB)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 112686b20..7f7b9f589 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not propose "KDE, GNOME or Custom" profiles if the partition is small
+ (< 2.5GB) otherwise the installer will not be able to install the full profile
- auto partitioning: ensure the "/" is bigger on small drives
Version 10.6.18 - 12 February 2008
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index f0c8347f6..9bdd47883 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -367,7 +367,8 @@ sub choosePackages {
if (!$o->{isUpgrade}) {
if (install::pkgs::packageByName($o->{packages}, 'task-kde') &&
- install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal')) {
+ install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal') &&
+ $availableC >= 2_500_000_000) { # don't chooseDesktop if not enough place
_chooseDesktop($o, $o->{rpmsrate_flags_chosen}, \$chooseGroups);
} else {
# don't ask for desktop if kde and gnome are not available on media (useful for mini iso)