diff options
| -rw-r--r-- | urpm.pm | 15 | ||||
| -rw-r--r-- | urpmi.spec | 8 |
2 files changed, 14 insertions, 9 deletions
@@ -1807,24 +1807,25 @@ this could happen if you mounted manually the directory when creating the medium unless ($error) { #- now... on pubkey - if (-s "$medium->{cachedir}/partial/pubkey") { + if (-s "$urpm->{cachedir}/partial/pubkey") { $urpm->{log}(N("examining pubkey file of \"%s\"...", $medium->{name})); - my (%keys, %unknown_keys); + my %key_ids; eval { - foreach ($urpm->parse_armored_file("$medium->{cachedir}/partial/pubkey")) { + foreach ($urpm->parse_armored_file("$urpm->{cachedir}/partial/pubkey")) { my $id; foreach my $kv (values %{$urpm->{keys} || {}}) { - $kv->{content} = $_->{content} and $keys{$id = $kv->{id}} = undef, last; + $kv->{content} = $_->{content} and $key_ids{$id = $kv->{id}} = undef, last; } unless ($id) { #- the key has not been found, this is important to import it now, #- update keys hash (as we do not know how to get key id from its content). #- and parse again to found the key. - $urpm->import_armored_file("$medium->{cachedir}/partial/pubkey", root => $urpm->{root}); + $urpm->{log}(N("...importing pubkey file of \"%s\"", $medium->{name})); + $urpm->import_armored_file("$urpm->{cachedir}/partial/pubkey", root => $urpm->{root}); $urpm->parse_pubkeys(root => $urpm->{root}); foreach my $kv (values %{$urpm->{keys} || {}}) { - $kv->{content} = $_->{content} and $keys{$id = $kv->{id}} = undef, last; + $kv->{content} = $_->{content} and $key_ids{$id = $kv->{id}} = undef, last; } #- now id should be defined, or there is a problem to import the keys... @@ -1832,7 +1833,7 @@ this could happen if you mounted manually the directory when creating the medium } } }; - %keys and $medium->{'key-ids'} = join ',', keys %keys; + keys(%key_ids) and $medium->{'key-ids'} = join ',', keys %key_ids; } } @@ -2,14 +2,14 @@ Name: urpmi Version: 4.4 -Release: 19mdk +Release: 20mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate Summary: User mode rpm install URL: http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/urpmi Requires: eject webfetch perl-DateManip >= 5.40 gnupg -PreReq: perl-Locale-gettext >= 1.01-7mdk rpmtools >= 4.3-6mdk perl-URPM >= 0.93 +PreReq: perl-Locale-gettext >= 1.01-7mdk rpmtools >= 4.3-6mdk perl-URPM >= 0.93-2mdk BuildRequires: bzip2-devel gettext rpm-devel >= 4.0.3 perl-MDK-Common-devel BuildRoot: %{_tmppath}/%{name}-buildroot BuildArch: noarch @@ -202,6 +202,10 @@ $urpm->update_media(nolock => 1); %changelog +* Mon Aug 11 2003 François Pons <fpons@mandrakesoft.com> 4.4-20mdk +- fixed bug 4637 and add reason for removing package in urpme. +- fixed handling of pubkey file. + * Wed Aug 6 2003 François Pons <fpons@mandrakesoft.com> 4.4-19mdk - fixed local package not found when using curl and without an absolute path. |