summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-10-16 09:44:21 +0000
committerFrancois Pons <fpons@mandriva.com>2003-10-16 09:44:21 +0000
commit8dca0b65f52548146b68de4c4db4a80bd07269ae (patch)
tree6941529b479d861b0b1c82d94d1f2b9367d771a3
parent142f585b52055ad9552339d91aaa4f06183d91ed (diff)
downloaddrakx-8dca0b65f52548146b68de4c4db4a80bd07269ae.tar
drakx-8dca0b65f52548146b68de4c4db4a80bd07269ae.tar.gz
drakx-8dca0b65f52548146b68de4c4db4a80bd07269ae.tar.bz2
drakx-8dca0b65f52548146b68de4c4db4a80bd07269ae.tar.xz
drakx-8dca0b65f52548146b68de4c4db4a80bd07269ae.zip
added external pubkey file management.
-rw-r--r--perl-install/pkgs.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 2f5b674a2..25096ed7e 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -377,7 +377,7 @@ sub psUsingHdlists {
}
sub psUsingHdlist {
- my ($prefix, $method, $packages, $hdlist, $medium, $rpmsdir, $descr, $selected, $o_fhdlist) = @_;
+ my ($prefix, $method, $packages, $hdlist, $medium, $rpmsdir, $descr, $selected, $o_fhdlist, $o_fpubkey) = @_;
my $fakemedium = "$descr ($method$medium)";
my $urpmidir = -w "$prefix/var/lib/urpmi" ? "$prefix/var/lib/urpmi" : "/tmp";
log::l("trying to read $hdlist for medium $medium");
@@ -415,7 +415,7 @@ 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("Mandrake/base/pubkey" . ($hdlist =~ /hdlist(\S*)\.cz2?/ && $1));
+ 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.