From ff3f52e7ce547e83075a5dfd4405730a8cf0e12e Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Wed, 30 Mar 2005 09:35:16 +0000 Subject: No need to ask the user for changing a removable media if this media is an ISO image --- urpm.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/urpm.pm b/urpm.pm index 7a2fda11..f63ed450 100644 --- a/urpm.pm +++ b/urpm.pm @@ -2641,10 +2641,12 @@ sub copy_packages_of_removable_media { #- by mounting some other directory. Try to figure it out and mount #- everything that might be necessary. while ($check_notfound->($id, $dir, is_iso($medium->{removable}) || 'removable')) { - $options{ask_for_medium} or $urpm->{fatal}(4, N("medium \"%s\" is not selected", $medium->{name})); + is_iso($medium->{removable}) || $options{ask_for_medium} + or $urpm->{fatal}(4, N("medium \"%s\" is not selected", $medium->{name})); $urpm->try_umounting($dir); system("/usr/bin/eject '$device' 2>/dev/null"); - $options{ask_for_medium}(remove_internal_name($medium->{name}), $medium->{removable}) + is_iso($medium->{removable}) + || $options{ask_for_medium}(remove_internal_name($medium->{name}), $medium->{removable}) or $urpm->{fatal}(4, N("medium \"%s\" is not selected", $medium->{name})); } if (-e $dir) { -- cgit v1.2.1