diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-11 15:33:49 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-11 15:33:49 +0000 |
commit | 937c72175b0e5d24e1ba42d8c35cb5e3e54172bf (patch) | |
tree | 2f5bc633335120c22153f113e4b5ecc2729cf6f6 /urpmi | |
parent | 0b88c3466e47ef6e88c0fdaddbb349da4cb7a3eb (diff) | |
download | urpmi-937c72175b0e5d24e1ba42d8c35cb5e3e54172bf.tar urpmi-937c72175b0e5d24e1ba42d8c35cb5e3e54172bf.tar.gz urpmi-937c72175b0e5d24e1ba42d8c35cb5e3e54172bf.tar.bz2 urpmi-937c72175b0e5d24e1ba42d8c35cb5e3e54172bf.tar.xz urpmi-937c72175b0e5d24e1ba42d8c35cb5e3e54172bf.zip |
enhance cdrom fallback without perl-Hal-Cdroms
Diffstat (limited to 'urpmi')
-rwxr-xr-x | urpmi | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -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) = @_; |