summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-30 09:35:16 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-30 09:35:16 +0000
commitff3f52e7ce547e83075a5dfd4405730a8cf0e12e (patch)
treec8ab084862b7ccc3b1c402d4c946a8d8bb4225bb
parentb16cdf48fc4bba0143ac30eea7fd6e8468ab171d (diff)
downloadurpmi-ff3f52e7ce547e83075a5dfd4405730a8cf0e12e.tar
urpmi-ff3f52e7ce547e83075a5dfd4405730a8cf0e12e.tar.gz
urpmi-ff3f52e7ce547e83075a5dfd4405730a8cf0e12e.tar.bz2
urpmi-ff3f52e7ce547e83075a5dfd4405730a8cf0e12e.tar.xz
urpmi-ff3f52e7ce547e83075a5dfd4405730a8cf0e12e.zip
No need to ask the user for changing a removable media if this media is an ISO
image
-rw-r--r--urpm.pm6
1 files 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) {