summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-08-20 16:23:58 +0000
committerFrancois Pons <fpons@mandriva.com>2003-08-20 16:23:58 +0000
commit3410e7518e8fed6ad12280552345e98f5b218e20 (patch)
tree48f832f435c6269bc34e1cb85b4ef9eeb42b82fb
parente9a91169694fa2de2423c8483b7fb6d75eadd61a (diff)
downloadurpmi-3410e7518e8fed6ad12280552345e98f5b218e20.tar
urpmi-3410e7518e8fed6ad12280552345e98f5b218e20.tar.gz
urpmi-3410e7518e8fed6ad12280552345e98f5b218e20.tar.bz2
urpmi-3410e7518e8fed6ad12280552345e98f5b218e20.tar.xz
urpmi-3410e7518e8fed6ad12280552345e98f5b218e20.zip
4.4-23mdk
-rw-r--r--urpm.pm4
-rw-r--r--urpmi.spec10
2 files changed, 10 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 7f539e3e..5ef6cd14 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -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...
diff --git a/urpmi.spec b/urpmi.spec
index 5d0a4639..46387034 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,14 +2,14 @@
Name: urpmi
Version: 4.4
-Release: 22mdk
+Release: 23mdk
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 gnupg
-PreReq: perl-Locale-gettext >= 1.01-7mdk rpmtools >= 4.3-6mdk perl-URPM >= 0.93-2mdk
+PreReq: perl-Locale-gettext >= 1.01-7mdk rpmtools >= 4.3-6mdk perl-URPM >= 0.93-7mdk
BuildRequires: bzip2-devel gettext rpm-devel >= 4.0.3 perl-MDK-Common-devel
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildArch: noarch
@@ -202,6 +202,12 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
%changelog
+* Wed Aug 20 2003 François Pons <fpons@mandrakesoft.com> 4.4-23mdk
+- fixed bad key ids recognized from pubkey during update of media.
+- simplified list and pubkey location to be more compatible with
+ previous version and avoid probing too many files.
+- simplified log to be more explicit when a key is imported.
+
* Tue Aug 19 2003 François Pons <fpons@mandrakesoft.com> 4.4-22mdk
- fixed MD5SUM and pubkey management for local media.
- fixed post deadlock with rpm < 4.2.