summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-05-04 13:18:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-05-04 13:18:32 +0000
commit124c84a7b764273358c6700c02ea8dc21c3bb9c3 (patch)
tree8e191ab08433dbb0a135d28403901d6916758a7b
parent818ce8749aeaefcf874161b25469ab92716eaeab (diff)
downloadurpmi-124c84a7b764273358c6700c02ea8dc21c3bb9c3.tar
urpmi-124c84a7b764273358c6700c02ea8dc21c3bb9c3.tar.gz
urpmi-124c84a7b764273358c6700c02ea8dc21c3bb9c3.tar.bz2
urpmi-124c84a7b764273358c6700c02ea8dc21c3bb9c3.tar.xz
urpmi-124c84a7b764273358c6700c02ea8dc21c3bb9c3.zip
- 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)
-rw-r--r--NEWS4
-rw-r--r--urpm/media.pm2
2 files changed, 6 insertions, 0 deletions
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 {