summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-13 11:54:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-13 11:54:16 +0000
commit47e693a13dac3ad1c3409f620a3d5caa3a747f90 (patch)
treecca6788753a107b91050c95fb4aa88360319d5e8
parente150804292cf6f19c2a37b08ccd1b5989e1a584c (diff)
downloadurpmi-47e693a13dac3ad1c3409f620a3d5caa3a747f90.tar
urpmi-47e693a13dac3ad1c3409f620a3d5caa3a747f90.tar.gz
urpmi-47e693a13dac3ad1c3409f620a3d5caa3a747f90.tar.bz2
urpmi-47e693a13dac3ad1c3409f620a3d5caa3a747f90.tar.xz
urpmi-47e693a13dac3ad1c3409f620a3d5caa3a747f90.zip
make it more explicit the parsing of the deprecated format removable_hdc://mnt/cdrom
-rw-r--r--urpm.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/urpm.pm b/urpm.pm
index eb46bab3..5b907716 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -358,9 +358,11 @@ sub analyse_url__file_if_local {
sub probe_removable_device {
my ($urpm, $medium) = @_;
- #- try to find device name in url scheme
- if ($medium->{url} && $medium->{url} =~ /^removable_?([^_:]*)(?:_[^:]*)?:/) {
- $medium->{removable} ||= $1 && "/dev/$1";
+ if ($medium->{url} && $medium->{url} =~ /^removable/) {
+ #- try to find device name in url scheme, this is deprecated, use medium option "removable" instead
+ if ($medium->{url} =~ /^removable_?([^_:]*)/) {
+ $medium->{removable} ||= $1 && "/dev/$1";
+ }
} else {
delete $medium->{removable};
return;