- urpmi.addmedia

  o [bugfix] look for media/$media_dir/media_info/pubkey instead of
    media/$media_dir/pubkey

2 files changed, 3 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 23d32122..7a6569f2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 - urpmi.addmedia
+  o [bugfix] look for media/$media_dir/media_info/pubkey instead of
+    media/$media_dir/pubkey
   o with --distrib, don't use previous media's pubkey if a pubkey is missing
     (eg: use pubkey_main for media "Main Updates" when pubkey_main_updates is missing)
 
diff --git a/urpm/media.pm b/urpm/media.pm
index 92b6221f..a416abab 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) {
 	$urpm->{log}(N("copying [%s] for medium \"%s\"...", $path, $medium->{name}));
 	copy_and_own($path, "$urpm->{cachedir}/partial/$name")