summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-01 16:18:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-01 16:18:06 +0000
commit27e3b71aa1c30edbd21bebf0da8fea326905850b (patch)
tree3fecfcff7cc306f6d7995fde55b01d4b122eea88
parenta92da50e0a99e1fd2f89f1b8ab0b56c23683a952 (diff)
downloaddrakx-27e3b71aa1c30edbd21bebf0da8fea326905850b.tar
drakx-27e3b71aa1c30edbd21bebf0da8fea326905850b.tar.gz
drakx-27e3b71aa1c30edbd21bebf0da8fea326905850b.tar.bz2
drakx-27e3b71aa1c30edbd21bebf0da8fea326905850b.tar.xz
drakx-27e3b71aa1c30edbd21bebf0da8fea326905850b.zip
add some logging
-rw-r--r--perl-install/install/steps_interactive.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 84fc58889..66ea2d15d 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -423,12 +423,13 @@ sub choosePackages {
my ($individual, $chooseGroups);
if (!$o->{isUpgrade}) {
- if (install::pkgs::packageByName($o->{packages}, 'task-kde4') &&
- install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal') &&
- $availableC >= 2_500_000_000) { # don't chooseDesktop if not enough place
+ my $tasks_ok = install::pkgs::packageByName($o->{packages}, 'task-kde4') &&
+ install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal');
+ if ($tasks_ok && $availableC >= 2_500_000_000) {
_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)
+ $tasks_ok ? log::l("not asking for desktop since not enough place") :
+ log::l("not asking for desktop since kde and gnome are not available on media (useful for mini iso)");
$chooseGroups = 1;
}
}