From 124c84a7b764273358c6700c02ea8dc21c3bb9c3 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 4 May 2007 13:18:32 +0000
Subject: - urpmi.addmedia   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)

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

diff --git a/NEWS b/NEWS
index 0e322ee1..23d32122 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- urpmi.addmedia
+  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)
+
 Version 4.9.23 - 3 May 2007, by Pascal "Pixel" Rigaux
 
 - urpmi
diff --git a/urpm/media.pm b/urpm/media.pm
index 5cad2842..92b6221f 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1552,6 +1552,8 @@ sub _read_cachedir_pubkey {
     if (keys(%key_ids)) {
 	$medium->{'key-ids'} = join(',', keys %key_ids);
     }
+
+    unlink "$urpm->{cachedir}/partial/pubkey";
 }
 
 sub _write_rpm_list {
-- 
cgit v1.2.1