summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-10-16 09:49:01 +0000
committerFrancois Pons <fpons@mandriva.com>2003-10-16 09:49:01 +0000
commitc774096c39d2e63e30dfff1ad77466d5472a63f3 (patch)
tree02d2f7d987d7bec9d410090ed4916c735ea5169f
parentc2ce26ddd4b45f0614a5fa55c2e95afabf88924a (diff)
downloaddrakx-c774096c39d2e63e30dfff1ad77466d5472a63f3.tar
drakx-c774096c39d2e63e30dfff1ad77466d5472a63f3.tar.gz
drakx-c774096c39d2e63e30dfff1ad77466d5472a63f3.tar.bz2
drakx-c774096c39d2e63e30dfff1ad77466d5472a63f3.tar.xz
drakx-c774096c39d2e63e30dfff1ad77466d5472a63f3.zip
make sure a pubkey file can be found if a hdlist handle is given when creating a media.
-rw-r--r--perl-install/pkgs.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 25096ed7e..1b27eaf36 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -415,8 +415,10 @@ sub psUsingHdlist {
#- get all keys corresponding in the right pubkey file,
#- they will be added in rpmdb later if not found.
- my $pubkey = install_any::getFile($o_fpubkey || "Mandrake/base/pubkey" . ($hdlist =~ /hdlist(\S*)\.cz2?/ && $1));
- $m->{pubkey} = [ $packages->parse_armored_file($pubkey) ];
+ if (!$o_fhdlist || $o_fpubkey) {
+ my $pubkey = install_any::getFile($o_fpubkey || "Mandrake/base/pubkey" . ($hdlist =~ /hdlist(\S*)\.cz2?/ && $1));
+ $m->{pubkey} = [ $packages->parse_armored_file($pubkey) ];
+ }
#- integrate medium in media list, only here to avoid download error (update) to be propagated.
$packages->{mediums}{$medium} = $m;