summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-04-19 13:28:31 +0000
committerFrancois Pons <fpons@mandriva.com>2000-04-19 13:28:31 +0000
commit6a05c7c12fcc70058febc82d139dbe4155ac951b (patch)
treeb569858f49c183313b4ba549609d4d41b997a457 /perl-install/install_steps_interactive.pm
parent9ac13461f4c9348b073f33b2331ffdd7d5b70bd5 (diff)
downloaddrakx-6a05c7c12fcc70058febc82d139dbe4155ac951b.tar
drakx-6a05c7c12fcc70058febc82d139dbe4155ac951b.tar.gz
drakx-6a05c7c12fcc70058febc82d139dbe4155ac951b.tar.bz2
drakx-6a05c7c12fcc70058febc82d139dbe4155ac951b.tar.xz
drakx-6a05c7c12fcc70058febc82d139dbe4155ac951b.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm10
1 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 7ceb35c08..f1f0774b5 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -333,12 +333,16 @@ sub chooseGroups {
sub chooseCD {
my ($o, $packages) = @_;
- my @mediums = pkgs::allMediums($packages);
+ my @mediums = grep { $_ > 1 } pkgs::allMediums($packages);
+
+ #- if no other medium available or a poor beginner.
+ #- note first CD is always selected and should not be unselected!
+ return if scalar(@mediums) == 0 || $::beginner;
$o->ask_many_from_list_ref('',
_("Choose other CD to install"),
- [ map { _("Cd-Rom labeled \"%s\"", pkgs::mediumDescr($packages, $_)) } grep { $_ > 1 } @mediums ],
- [ map { \$packages->[2]{$_}{selected} } grep { $_ } @mediums ] #- check for change!
+ [ map { _("Cd-Rom labeled \"%s\"", pkgs::mediumDescr($packages, $_)) } @mediums ],
+ [ map { \$packages->[2]{$_}{selected} } @mediums ] #- check for change!
) or goto &chooseCD unless $::beginner;
}