diff options
author | Mystery Man <unknown@mandriva.org> | 2003-11-21 12:53:39 +0000 |
---|---|---|
committer | Mystery Man <unknown@mandriva.org> | 2003-11-21 12:53:39 +0000 |
commit | 7396369ef190a049b3a779a54edd76ff118f3c28 (patch) | |
tree | 20c2a6d7fcd96433d0d91b1460b5604a6d7267ce /perl-install/crypto.pm | |
parent | e41742b093fdb26bcae87e9d5b30d4d7bca93ea9 (diff) | |
download | drakx-backup-do-not-use-7396369ef190a049b3a779a54edd76ff118f3c28.tar drakx-backup-do-not-use-7396369ef190a049b3a779a54edd76ff118f3c28.tar.gz drakx-backup-do-not-use-7396369ef190a049b3a779a54edd76ff118f3c28.tar.bz2 drakx-backup-do-not-use-7396369ef190a049b3a779a54edd76ff118f3c28.tar.xz drakx-backup-do-not-use-7396369ef190a049b3a779a54edd76ff118f3c28.zip |
This commit was manufactured by cvs2svn to create tag 'MDK92-AMD64'.MDK92-AMD64
Diffstat (limited to 'perl-install/crypto.pm')
-rw-r--r-- | perl-install/crypto.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm index 8fa979678..30cc02c5a 100644 --- a/perl-install/crypto.pm +++ b/perl-install/crypto.pm @@ -126,6 +126,13 @@ sub getPackages { $crypto::host = $mirror; + #- get pubkey file first as we cannot handle 2 files opened simultaneously. + my $pubkey; + eval { + my $fpubkey = getFile("base/pubkey", $mirror); + $pubkey = [ $packages->parse_armored_file($fpubkey) ]; + }; + #- check first if there is something to get... my $fhdlist = getFile("base/hdlist.cz", $mirror); unless ($fhdlist) { @@ -136,7 +143,7 @@ sub getPackages { #- extract hdlist of crypto, then depslist. require pkgs; my $update_medium = pkgs::psUsingHdlist($prefix, 'ftp', $packages, "hdlist-updates.cz", "1u", "RPMS", - "Updates for Mandrake Linux " . version(), 1, $fhdlist); + "Updates for Mandrake Linux " . version(), 1, $fhdlist, $pubkey); if ($update_medium) { log::l("read updates hdlist"); #- keep in mind where is the URL prefix used according to mirror (for install_any::install_urpmi). |