diff options
author | Francois Pons <fpons@mandriva.com> | 2003-06-13 14:37:54 +0000 |
---|---|---|
committer | Francois Pons <fpons@mandriva.com> | 2003-06-13 14:37:54 +0000 |
commit | 50acfe2c3b02fde7f51e8c1b37bac4d60fce324e (patch) | |
tree | 8b5eaebf4d21d4c3007445e0dbebc0d686222818 | |
parent | fd239335d86c7a8a28016d1a903dfb3c957fa214 (diff) | |
download | urpmi-50acfe2c3b02fde7f51e8c1b37bac4d60fce324e.tar urpmi-50acfe2c3b02fde7f51e8c1b37bac4d60fce324e.tar.gz urpmi-50acfe2c3b02fde7f51e8c1b37bac4d60fce324e.tar.bz2 urpmi-50acfe2c3b02fde7f51e8c1b37bac4d60fce324e.tar.xz urpmi-50acfe2c3b02fde7f51e8c1b37bac4d60fce324e.zip |
fixed stupid error where no key_ids option is set, everything finish as missing
keys errors.
-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); + } } } } |