o use hal to wait-for/mount cdroms:

    you can now use more than one cdrom drive

big commit, no time to split it... some details:
- split urpm::removable into urpm::removable and urpm::cdrom
- fix setting $urpm->{removable_mounted}
- in try_mounting_non_cdroms(), check for local url, simpler than checking
  is_cdrom_url and then checking file_from_local_medium
- fix _try_mounting_medium() not mounting non-cdrom anymore
  (regression introduced during devel)
- even if urpmi says it wants cdroms in a given order, if you make a mistake,
  it will use the one you give (as a side-effect, it simplifies the sort on
  "already mounted" cdrom (cf _sort_media disappearing))

1 files changed, 5 insertions, 2 deletions

diff --git a/urpmi b/urpmi
index 547af95e..d93b83c5 100755
--- a/urpmi
+++ b/urpmi
@@ -620,7 +620,6 @@ my $exit_code = urpm::main_loop::run($urpm, $state,
 				     \@ask_unselect, \%requested, {
     (!$urpm->{options}{auto} || $allow_medium_change ? (copy_removable =>  sub {
 	my $msg = N("Please insert the medium named \"%s\"", $_[0]);
-	my $msg2 = N("Press Enter when ready...");
 	if ($ENV{DISPLAY} && $::gui) {
 	    #- probably run from a drak tool
 	    (my $gmessage) = grep { -x $_ } '/usr/X11R6/bin/gmessage', '/usr/bin/gmessage';
@@ -628,7 +627,11 @@ my $exit_code = urpm::main_loop::run($urpm, $state,
 		return system($gmessage, '-buttons', N("Ok") . ':1,' . N("Cancel") . ':0', "\n$msg\n");
 	    }
 	}
-	return defined message_input_("$msg\n$msg2 ");
+	print "$msg\n";
+
+	require Hal::Cdroms;
+	Hal::Cdroms->new->wait_for_insert;
+	1;
     }) : ()),
     trans_log => sub {
 #	    my ($mode, $file, $percent, $total, $eta, $speed) = @_;