From 47e693a13dac3ad1c3409f620a3d5caa3a747f90 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 13 Nov 2006 11:54:16 +0000
Subject: make it more explicit the parsing of the deprecated format
 removable_hdc://mnt/cdrom

---
 urpm.pm | 8 +++++---
 1 file 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;
-- 
cgit v1.2.1