diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-02-29 11:13:21 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-02-29 11:13:21 +0000 |
| commit | cef63ab20496cff6686bf373c4875e26a906860f (patch) | |
| tree | 6b2a69dc15b52a4237fb03f5bb923599a11e7b71 | |
| parent | baf068fed48770a38dc621da01369848ae042dc8 (diff) | |
| download | urpmi-cef63ab20496cff6686bf373c4875e26a906860f.tar urpmi-cef63ab20496cff6686bf373c4875e26a906860f.tar.gz urpmi-cef63ab20496cff6686bf373c4875e26a906860f.tar.bz2 urpmi-cef63ab20496cff6686bf373c4875e26a906860f.tar.xz urpmi-cef63ab20496cff6686bf373c4875e26a906860f.zip | |
do not pass the device around (we don't want to force a device anymore)
| -rw-r--r-- | urpm/removable.pm | 2 | ||||
| -rwxr-xr-x | urpmi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/urpm/removable.pm b/urpm/removable.pm index 8addf002..c7d8e74d 100644 --- a/urpm/removable.pm +++ b/urpm/removable.pm @@ -188,7 +188,7 @@ sub _mount_cdrom { try_umounting($urpm, $dir); system("/usr/bin/eject '$medium->{removable}' 2>/dev/null"); - $ask_for_medium->(remove_internal_name($medium->{name}), $medium->{removable}) + $ask_for_medium->(remove_internal_name($medium->{name})) or $urpm->{fatal}(4, N("medium \"%s\" is not available", $medium->{name})); } } @@ -619,7 +619,7 @@ my $exit_code = urpm::main_loop::run($urpm, $state, int(@names || @src_names || @files || @src_files), \@ask_unselect, \%requested, { (!$urpm->{options}{auto} || $allow_medium_change ? (copy_removable => sub { - my $msg = N("Please insert the medium named \"%s\" on device [%s]", $_[0], $_[1]); + 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 |