summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-11 16:07:48 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-11 16:07:48 +0000
commite05c3833b56823ab649708866db8026764a15d87 (patch)
tree01365bd32a0cecf9506bfec892b3171bee98afb8 /urpm.pm
parent7d84ce9b8afab615fbeb69bfa3f27fd3958bc1d5 (diff)
downloadurpmi-e05c3833b56823ab649708866db8026764a15d87.tar
urpmi-e05c3833b56823ab649708866db8026764a15d87.tar.gz
urpmi-e05c3833b56823ab649708866db8026764a15d87.tar.bz2
urpmi-e05c3833b56823ab649708866db8026764a15d87.tar.xz
urpmi-e05c3833b56823ab649708866db8026764a15d87.zip
Code factorization
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/urpm.pm b/urpm.pm
index df9b94a1..65c4f4c1 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -3277,11 +3277,12 @@ sub check_sources_signatures {
and $medium = $_, last;
}
}
+ #- no medium found for this rpm ?
+ next if !$medium;
#- check whether verify-rpm is specifically disabled for this medium
- $medium && defined $medium->{'verify-rpm'} && !$medium->{'verify-rpm'}
- and next;
+ next if defined $medium->{'verify-rpm'} && !$medium->{'verify-rpm'};
- my $key_ids = $medium && $medium->{'key-ids'} || $urpm->{options}{'key-ids'};
+ my $key_ids = $medium->{'key-ids'} || $urpm->{options}{'key-ids'};
#- check that the key ids of the medium match the key ids of the package.
if ($key_ids) {
my $valid_ids = 0;