diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-25 12:08:46 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-25 12:08:46 +0000 |
| commit | 2a27811b3a8d757d26d94a54d3a77c40f54d8a40 (patch) | |
| tree | 262c88bad079709cfc9fef593ede2cdd3f7d99c2 | |
| parent | d1d93963ddf85bfc62ef74498db8ddaf40b19e75 (diff) | |
| download | drakx-backup-do-not-use-2a27811b3a8d757d26d94a54d3a77c40f54d8a40.tar drakx-backup-do-not-use-2a27811b3a8d757d26d94a54d3a77c40f54d8a40.tar.gz drakx-backup-do-not-use-2a27811b3a8d757d26d94a54d3a77c40f54d8a40.tar.bz2 drakx-backup-do-not-use-2a27811b3a8d757d26d94a54d3a77c40f54d8a40.tar.xz drakx-backup-do-not-use-2a27811b3a8d757d26d94a54d3a77c40f54d8a40.zip | |
- don't ask for desktop and go directly to choose groups if kde and gnome are
not available on media (useful for mini iso)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index e6479bc09..6754e1c4b 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,6 @@ - don't crash install when mounting CD fails (#33421) +- don't ask for desktop and go directly to choose groups if kde and gnome are + not available on media (useful for mini iso) Version 10.4.211 - 24 September 2007, by Pascal "Pixel" Rigaux diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index b02f066e8..d650c7d82 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -365,7 +365,15 @@ sub choosePackages { my $min_mark = 4; my ($individual, $chooseGroups); - _chooseDesktop($o, $o->{rpmsrate_flags_chosen}, \$chooseGroups) if !$o->{upgrade}; + if (!$o->{upgrade}) { + if (install::pkgs::packageByName($o->{packages}, 'task-kde') && + install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal')) { + _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) + $chooseGroups = 1; + } + } chooseGroups: $o->chooseGroups($o->{packages}, $o->{compssUsers}, $min_mark, \$individual) if $chooseGroups; |