From e05c3833b56823ab649708866db8026764a15d87 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Wed, 11 Jan 2006 16:07:48 +0000 Subject: Code factorization --- urpm.pm | 7 ++++--- 1 file 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; -- cgit v1.2.1