summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-02-17 17:53:47 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-02-17 17:53:47 +0000
commit05fbbc2038b06cecad485a842f859dc10dd5f8ee (patch)
tree3e3a28775ae21b083790f9c1e08c691d2ab768b1 /urpm.pm
parentf24b281ff181068a794f3545833ea452ea0ba2a7 (diff)
downloadurpmi-05fbbc2038b06cecad485a842f859dc10dd5f8ee.tar
urpmi-05fbbc2038b06cecad485a842f859dc10dd5f8ee.tar.gz
urpmi-05fbbc2038b06cecad485a842f859dc10dd5f8ee.tar.bz2
urpmi-05fbbc2038b06cecad485a842f859dc10dd5f8ee.tar.xz
urpmi-05fbbc2038b06cecad485a842f859dc10dd5f8ee.zip
Make ejection less noisy
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 55bdd07a..ff76925e 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -2592,7 +2592,8 @@ sub copy_packages_of_removable_media {
#- 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}));
- $urpm->try_umounting($dir); system("eject", $device);
+ $urpm->try_umounting($dir);
+ system("/usr/bin/eject '$device' 2>/dev/null");
$options{ask_for_medium}(remove_internal_name($medium->{name}), $medium->{removable})
or $urpm->{fatal}(4, N("medium \"%s\" is not selected", $medium->{name}));
}
@@ -2644,9 +2645,10 @@ sub copy_packages_of_removable_media {
}
}
foreach my $device (keys %removables) {
- #- here we have only removable device.
- #- if more than one media use this device, we have to sort
- #- needed package to copy first the needed rpm files.
+ next if $device =~ m![^a-zA-Z0-9_./-]!; #- bad path
+ #- Here we have only removable devices.
+ #- If more than one media uses this device, we have to sort
+ #- needed packages to copy the needed rpm files.
if (@{$removables{$device}} > 1) {
my @sorted_media = sort { values %{$list->[$a]} <=> values %{$list->[$b]} } @{$removables{$device}};