From 07e63eb1aa32230a39cdcfb3771f1d9f87a6e188 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 2 Mar 2009 13:59:14 +0000
Subject: (ask_change_cd) adapt to new API

---
 perl-install/install/steps.pm             |  4 ++--
 perl-install/install/steps_interactive.pm | 27 ++++-----------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

(limited to 'perl-install/install')

diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 6ffb79935..bd81563bc 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -254,8 +254,8 @@ sub ask_deselect_media__copy_on_disk {
 }
 
 sub ask_change_cd {
-    my (undef, $phys_m, $_o_rel_file) = @_;
-    log::l("change to medium " . install::media::phys_medium_to_string($phys_m) . " refused (it can't be done automatically)");
+    my (undef, $phys_m) = @_;
+    log::l("change to medium $phys_m refused (it can't be done automatically)");
     0;
 }
 
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 5c449edb4..973d97e88 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -361,37 +361,18 @@ sub while_suspending_time {
 
 # nb: $file can be a directory
 sub ask_change_cd {
-    my ($o, $phys_m, $o_rel_file) = @_;
+    my ($o, $medium) = @_;
 
-    while_suspending_time($o, sub { ask_change_cd_($o, $phys_m, $o_rel_file) });
+    while_suspending_time($o, sub { ask_change_cd_($o, $medium) });
 }
 
 sub ask_change_cd_ {
-    my ($o, $phys_m, $o_rel_file) = @_;
-
-    local $| = 1; print "\a";
-
-    foreach (1 .. 32) {
-	install::media::umount_phys_medium($phys_m);
-	install::media::openCdromTray($phys_m->{device});
+    my ($o, $medium) = @_;
 
 	$o->ask_okcancel('', N("Change your Cd-Rom!
 Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.
-If you do not have it, press Cancel to avoid installation from this Cd-Rom.", $phys_m->{name}), 1) or return;
-
-	foreach (1 .. 7) {
-	    eval { fs::mount::part($phys_m) };
-	    last if $phys_m->{isMounted};
-	    # we must retry since mount will now fail instead of waiting for the drive to recognise the CD (cf #43230)
-	    sleep 2;
-	}
-
-	#- it can be a directory, so don't use -f
-	!$o_rel_file || -e install::media::path($phys_m, $o_rel_file) and return 1;
+If you do not have it, press Cancel to avoid installation from this Cd-Rom.", $medium), 1) or return;
 
-	log::l("file " . install::media::path($phys_m, $o_rel_file) . " not found");
-    }
-    undef;
 }
 
 sub selectSupplMedia {
-- 
cgit v1.2.1