summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-12 16:56:31 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-12 16:56:31 +0000
commit28ab17ec3fbdc1062af4e9a91fe01a38b12577ed (patch)
treec9cc0825ea94044f816604365adb633b6c9ed45c
parente05c3833b56823ab649708866db8026764a15d87 (diff)
downloadurpmi-28ab17ec3fbdc1062af4e9a91fe01a38b12577ed.tar
urpmi-28ab17ec3fbdc1062af4e9a91fe01a38b12577ed.tar.gz
urpmi-28ab17ec3fbdc1062af4e9a91fe01a38b12577ed.tar.bz2
urpmi-28ab17ec3fbdc1062af4e9a91fe01a38b12577ed.tar.xz
urpmi-28ab17ec3fbdc1062af4e9a91fe01a38b12577ed.zip
Verify signature in order
-rw-r--r--urpm.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index 65c4f4c1..9435e676 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -3258,9 +3258,11 @@ sub translate_why_removed {
sub check_sources_signatures {
my ($urpm, $sources_install, $sources, %options) = @_;
my ($medium, %invalid_sources);
+ my $s = $sources_install;
- foreach my $id (sort { $a <=> $b } keys %$sources_install, keys %$sources) {
- my $filepath = $sources_install->{$id} || $sources->{$id};
+ foreach my $id (keys %$sources_install, -1, keys %$sources) {
+ if ($id == -1) { $s = $sources; next }
+ my $filepath = $s->{$id};
my $verif = URPM::verify_rpm($filepath);
if ($verif =~ /NOT OK/) {