From 1efa18b705469e57e818cef1b0c4b4d84df1e51e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 29 May 2007 07:38:26 +0000
Subject: - urpmi.addmedia   o [bugfix] look for
 media/$media_dir/media_info/pubkey instead of     media/$media_dir/pubkey
 (backport from trunk)

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

diff --git a/NEWS b/NEWS
index a2bdb690..2880c6db 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmi.addmedia
+  o [bugfix] look for media/$media_dir/media_info/pubkey instead of
+    media/$media_dir/pubkey
 - for rpmdrake
   o make translate_why_removed() safe to call (cf bug #28613)
 
diff --git a/urpm/media.pm b/urpm/media.pm
index 2c27aa32..866f4607 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1164,7 +1164,7 @@ sub _get_list_or_pubkey__local {
     my ($urpm, $medium, $name) = @_;
 
     my $path = _hdlist_dir($medium) . "/$name" . _hdlist_suffix($medium);
-    -e $path or $path = file_from_local_url($medium->{url}) . "/$name";
+    -e $path or $path = file_from_local_url($medium->{url}) . "/media_info/$name";
     if (-e $path) {
 	copy_and_own($path, "$urpm->{cachedir}/partial/$name")
 	  or $urpm->{error}(N("...copying failed")), return;
-- 
cgit v1.2.1