From ab2dacf9ef8a8098d398a922205c24904925fa52 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 29 Feb 2008 10:20:55 +0000
Subject: fix --mirrorlist broken by _migrate_removable_device

---
 urpm/media.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'urpm/media.pm')

diff --git a/urpm/media.pm b/urpm/media.pm
index 4c20f0be..85ec6b04 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -392,6 +392,8 @@ sub remove_user_media_info_files {
 sub _migrate_removable_device {
     my ($urpm, $medium) = @_;
 
+    $medium->{url} or return;
+
     # always drop {removable}, it is obsolete
     # (nb: for iso files, {removable} has already been renamed into {iso} internally)
     delete $medium->{removable};
@@ -407,7 +409,7 @@ sub _migrate_removable_device {
 sub _migrate_removable_url {
     my ($url) = @_;
 
-    if ($url && $url =~ /^removable/) {
+    if ($url =~ /^removable/) {
 	$url =~ s!^removable(.*?)://!/!;
 	if ($url =~ s!/(mnt|media)/cd\w+/?!cdrom://!i) {
 	    # success!
-- 
cgit v1.2.1