From f07e8e5ad90fac9eddc0a3444b5cca0114f1be05 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 29 May 2007 07:39:04 +0000
Subject: - urpmi.addmedia   o [bugfix] fix removable://... (#30257)

(backport from trunk)
---
 NEWS          | 1 +
 urpm/media.pm | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 2880c6db..d44f2193 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 - urpmi.addmedia
+  o [bugfix] fix removable://... (#30257)
   o [bugfix] look for media/$media_dir/media_info/pubkey instead of
     media/$media_dir/pubkey
 - for rpmdrake
diff --git a/urpm/media.pm b/urpm/media.pm
index 866f4607..8f874e3d 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -296,7 +296,7 @@ sub _url_with_hdlist_basename {
 }
 sub _hdlist_dir {
     my ($medium) = @_;
-    my $base = file_from_file_url($medium->{url}) || $medium->{url};
+    my $base = file_from_local_url($medium->{url}) || $medium->{url};
     $medium->{with_hdlist}
       ? reduce_pathname("$base/$medium->{with_hdlist}/..")
       : $medium->{media_info_dir} && reduce_pathname("$base/$medium->{media_info_dir}");
@@ -868,7 +868,7 @@ sub _probe_with_try_list {
     my $probe = sub {
 	my ($synthesis, $media_info_dir) = @_;
 
-	my $base = file_from_file_url($medium->{url}) || $medium->{url};
+	my $base = file_from_local_url($medium->{url}) || $medium->{url};
 	my $url = reduce_pathname("$base/$media_info_dir") . '/' . ($synthesis ? 'synthesis.hdlist.cz' : 'hdlist.cz');
 	$f->($url) or return;
 
@@ -912,7 +912,7 @@ sub may_reconfig_urpmi {
     my ($urpm, $medium) = @_;
 
     my $f;
-    if (my $dir = file_from_file_url($medium->{url})) {
+    if (my $dir = file_from_local_url($medium->{url})) {
 	$f = reduce_pathname("$dir/reconfig.urpmi");
     } else {
 	unlink($f = "$urpm->{cachedir}/partial/reconfig.urpmi");
@@ -921,7 +921,7 @@ sub may_reconfig_urpmi {
     if (-s $f) {
 	reconfig_urpmi($urpm, $f, $medium->{name});
     }
-    unlink $f if !file_from_file_url($medium->{url});
+    unlink $f if !file_from_local_url($medium->{url});
 }
 
 #- read a reconfiguration file for urpmi, and reconfigure media accordingly
-- 
cgit v1.2.1