diff options
| -rwxr-xr-x | urpmi | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -575,11 +575,11 @@ if ($urpm->{options}{'verify-rpm'}) { } my $key_ids = $medium && $medium->{key_ids} || $urpm->{options}{key_ids}; - my $valid_ids = 0; - my $invalid_ids = 0; - #- check the key ids of the medium are matching (all) the given key id of the package. if ($key_ids) { + my $valid_ids = 0; + my $invalid_ids = 0; + foreach my $key_id ($verif =~ /#(\S+)/g) { if (grep { hex($_) == hex($key_id) } split /[,\s]+/, $key_ids) { ++$valid_ids; @@ -587,12 +587,12 @@ if ($urpm->{options}{'verify-rpm'}) { ++$invalid_ids; } } - } - if ($invalid_ids) { - $invalid_sources{$sources_install{$id} || $sources{$id}} = N("Invalid Key ID (%s)", $verif); - } elsif (!$valid_ids) { - $invalid_sources{$sources_install{$id} || $sources{$id}} = N("Missing signature (%s)", $verif); + if ($invalid_ids) { + $invalid_sources{$sources_install{$id} || $sources{$id}} = N("Invalid Key ID (%s)", $verif); + } elsif (!$valid_ids) { + $invalid_sources{$sources_install{$id} || $sources{$id}} = N("Missing signature (%s)", $verif); + } } } } |