summaryrefslogtreecommitdiffstats
path: root/urpm/media.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-12-19 15:20:53 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-12-19 15:20:53 +0000
commit4205a6a96ffe26f8022e003dd81ba8ad8096766e (patch)
treea8d3f6a3b31d180029ee22e65b80494652c44464 /urpm/media.pm
parent4b7756114dbe0019f269ae876d531a424902f459 (diff)
downloadurpmi-4205a6a96ffe26f8022e003dd81ba8ad8096766e.tar
urpmi-4205a6a96ffe26f8022e003dd81ba8ad8096766e.tar.gz
urpmi-4205a6a96ffe26f8022e003dd81ba8ad8096766e.tar.bz2
urpmi-4205a6a96ffe26f8022e003dd81ba8ad8096766e.tar.xz
urpmi-4205a6a96ffe26f8022e003dd81ba8ad8096766e.zip
don't allow getting a different pubkey unless using forcekey
(ie revert to behaviour prior to 2007-12-10)
Diffstat (limited to 'urpm/media.pm')
-rw-r--r--urpm/media.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index 75a1b045..be91f4af 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1237,11 +1237,10 @@ sub _read_cachedir_pubkey {
$urpm->{error}(N("unable to import pubkey file of \"%s\"", $medium->{name}));
}
});
- if (keys(%key_ids)) {
- $medium->{'key-ids'} = join(',', keys %key_ids);
- }
unlink "$urpm->{cachedir}/partial/pubkey";
+
+ join(',', keys %key_ids);
}
#- options: callback, force, nomd5sum, probe_with, quiet, nopubkey, wait_lock
@@ -1316,7 +1315,7 @@ sub _update_medium_first_pass_ {
$medium->{modified} = 0;
_get_pubkey_and_descriptions($urpm, $medium, $options{nopubkey});
- _read_cachedir_pubkey($urpm, $medium, $options{wait_lock});
+ $medium->{'key-ids'} ||= _read_cachedir_pubkey($urpm, $medium, $options{wait_lock});
generate_medium_names($urpm, $medium);
1;