*** empty log message ***

4 files changed, 17 insertions, 6 deletions

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 88a63d65e..bbceee428 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-19  François Pons  <fpons@mandrakesoft.com>
+
+	* install_steps_interactive.pm: fixed crazy mutli CD manipulation.
+	* printer.pm: fixed wrong prototype of print_pages.
+
 2000-04-17  Pixel  <pixel@mandrakesoft.com>
 
 	* lilo.pm (suggest): in failsafe, runlevel ASKRUNLEVEL (handled by
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;
 }
 
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 20f16c442..b06b193f7 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -130,7 +130,7 @@ sub ask_from_list_with_help {
 #- defaults to simple ask_from_list
 sub ask_from_list_with_helpW {
     my ($o, $title, $messages, $l, $help, $def) = @_;
-    ask_from_listW($o, $title, $messages, $l, $def);
+    $o->ask_from_listW($o, $title, $messages, $l, $def);
 }
 
 sub ask_from_list2_with_help_($$$$$;$) {
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index ab3464b9a..69a8db954 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -702,11 +702,13 @@ sub restart_queue($) {
     run_program::rooted($prefix, "lpd"); sleep 1;
 }
 
-sub print_pages($$@) {
+sub print_pages($@) {
     my ($queue, @pages) = @_;
 
     require run_program;
-    run_program::rooted($prefix, "lpr", "-P$queue", $_) foreach @pages;
+    foreach (@pages) {
+	run_program::rooted($prefix, "lpr", "-P$queue", $_);
+    }
 
     sleep 5; #- allow lpr to send pages.
     local *F;