summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-24 06:39:29 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-24 06:39:29 +0000
commit2006454d4511f4e4170a4084d214d83b0170d06b (patch)
treeaff99732d75aa6ba2f8c5f1fbc30c7426c412fc0 /perl-install/install
parent02e59a3353e6fdd3f81243908fa61a38984ab5d5 (diff)
downloaddrakx-2006454d4511f4e4170a4084d214d83b0170d06b.tar
drakx-2006454d4511f4e4170a4084d214d83b0170d06b.tar.gz
drakx-2006454d4511f4e4170a4084d214d83b0170d06b.tar.bz2
drakx-2006454d4511f4e4170a4084d214d83b0170d06b.tar.xz
drakx-2006454d4511f4e4170a4084d214d83b0170d06b.zip
(choosePackages) fix offering desktop choice since DVD has task-kde4-minimal
instead of task-kde4 (Luc Menut, mga#5574)
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c5e1980f7..645af150c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix offering desktop choice (DVD has task-kde4-minimal instead of task-kde4)
+ (mga#5574)
- partitionning:
o do not set fs_type to ext4 for raw LVM/RAID/LUKS
o detect LVM on top on Encrypted partitions (mga#5330)
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index c5a834e27..c40e3ffd6 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -412,7 +412,7 @@ sub choosePackages {
my ($individual, $chooseGroups);
if (!$o->{isUpgrade}) {
- my $tasks_ok = install::pkgs::packageByName($o->{packages}, 'task-kde4') &&
+ my $tasks_ok = install::pkgs::packageByName($o->{packages}, 'task-kde4-minimal') &&
install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal');
if ($tasks_ok && $availableC >= 2_500_000_000) {
_chooseDesktop($o, $o->{rpmsrate_flags_chosen}, \$chooseGroups);