From c774096c39d2e63e30dfff1ad77466d5472a63f3 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Thu, 16 Oct 2003 09:49:01 +0000 Subject: make sure a pubkey file can be found if a hdlist handle is given when creating a media. --- perl-install/pkgs.pm | 6 ++++-- 1 file 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; -- cgit v1.2.1