diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-08-20 16:23:58 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-08-20 16:23:58 +0000 |
| commit | 3410e7518e8fed6ad12280552345e98f5b218e20 (patch) | |
| tree | 48f832f435c6269bc34e1cb85b4ef9eeb42b82fb /urpm.pm | |
| parent | e9a91169694fa2de2423c8483b7fb6d75eadd61a (diff) | |
| download | urpmi-3410e7518e8fed6ad12280552345e98f5b218e20.tar urpmi-3410e7518e8fed6ad12280552345e98f5b218e20.tar.gz urpmi-3410e7518e8fed6ad12280552345e98f5b218e20.tar.bz2 urpmi-3410e7518e8fed6ad12280552345e98f5b218e20.tar.xz urpmi-3410e7518e8fed6ad12280552345e98f5b218e20.zip | |
4.4-23mdk
Diffstat (limited to 'urpm.pm')
| -rw-r--r-- | urpm.pm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1810,7 +1810,7 @@ this could happen if you mounted manually the directory when creating the medium foreach my $k ($urpm->parse_armored_file("$urpm->{cachedir}/partial/pubkey")) { my $id; foreach my $kv (values %{$urpm->{keys} || {}}) { - $kv->{content} eq $k->{content} and $key_ids{$id = $kv->{id}} = undef, last; + URPM::compare_pubkeys($kv, $k) == 0 and $key_ids{$id = $kv->{id}} = undef, last; } unless ($id) { #- the key has not been found, this is important to import it now, @@ -1820,7 +1820,7 @@ this could happen if you mounted manually the directory when creating the medium $urpm->parse_pubkeys(root => $urpm->{root}); foreach my $kv (values %{$urpm->{keys} || {}}) { - $kv->{content} eq $k->{content} and $key_ids{$id = $kv->{id}} = undef, last; + URPM::compare_pubkeys($kv, $k) == 0 and $key_ids{$id = $kv->{id}} = undef, last; } #- now id should be defined, or there is a problem to import the keys... |