diff options
| -rw-r--r-- | urpm/cdrom.pm | 2 | ||||
| -rwxr-xr-x | urpmi | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/urpm/cdrom.pm b/urpm/cdrom.pm index 385ac978..6b3ffc5c 100644 --- a/urpm/cdrom.pm +++ b/urpm/cdrom.pm @@ -63,7 +63,7 @@ sub _try_mounting_cdrom_using_hal { $urpm->{cdrom_mounted} = {}; # reset - eval { require Hal::Cdroms; 1 } or $urpm->{error}(N("you must mount cdrom or install perl-Hal-Cdroms to have it done automatically")), return(); + eval { require Hal::Cdroms; 1 } or $urpm->{error}(N("You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done automatically)")), return(); my $hal_cdroms = Hal::Cdroms->new; foreach my $hal_path ($hal_cdroms->list) { @@ -627,11 +627,14 @@ my $exit_code = urpm::main_loop::run($urpm, $state, return system($gmessage, '-buttons', N("Ok") . ':1,' . N("Cancel") . ':0', "\n$msg\n"); } } - print "$msg\n"; - - require Hal::Cdroms; - Hal::Cdroms->new->wait_for_insert; - 1; + if (eval { require Hal::Cdroms; 1 }) { + print "$msg\n"; + Hal::Cdroms->new->wait_for_insert; + 1; + } else { + my $msg2 = N("Press Enter when mounted..."); + defined message_input_("$msg\n$msg2 "); + } }) : ()), trans_log => sub { # my ($mode, $file, $percent, $total, $eta, $speed) = @_; |