diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-05-31 15:23:37 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-05-31 15:23:37 +0000 |
| commit | 3cd3640882a76b57b7d41372788666d3222a126e (patch) | |
| tree | e2258493b15f62aa6671fecb2ea8cba0863877d6 | |
| parent | 36159f264b0b51c3be357d6770a34cf463ab3763 (diff) | |
| download | urpmi-3cd3640882a76b57b7d41372788666d3222a126e.tar urpmi-3cd3640882a76b57b7d41372788666d3222a126e.tar.gz urpmi-3cd3640882a76b57b7d41372788666d3222a126e.tar.bz2 urpmi-3cd3640882a76b57b7d41372788666d3222a126e.tar.xz urpmi-3cd3640882a76b57b7d41372788666d3222a126e.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)
(backported from trunk)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | urpm/media.pm | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -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.21.1 - 29 May 2007, by Pascal "Pixel" Rigaux - urpmi.addmedia diff --git a/urpm/media.pm b/urpm/media.pm index 43b6deba..e12ba58f 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -1551,6 +1551,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 { |