diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-10-16 12:34:44 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-10-16 12:34:44 +0000 |
| commit | 855dda4bbb078c327a8c4b772473e97d23075c03 (patch) | |
| tree | 74540bd7ab3aab2fd65a85d24f98a0289f1c8073 /perl-install/crypto.pm | |
| parent | 1bab15e2b847f7142de235b728692ee1affc9389 (diff) | |
| download | drakx-backup-do-not-use-855dda4bbb078c327a8c4b772473e97d23075c03.tar drakx-backup-do-not-use-855dda4bbb078c327a8c4b772473e97d23075c03.tar.gz drakx-backup-do-not-use-855dda4bbb078c327a8c4b772473e97d23075c03.tar.bz2 drakx-backup-do-not-use-855dda4bbb078c327a8c4b772473e97d23075c03.tar.xz drakx-backup-do-not-use-855dda4bbb078c327a8c4b772473e97d23075c03.zip | |
fixed code to avoid opening 2 files simultaneously.
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 60ac69d4d..d2bb09117 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) { @@ -137,7 +144,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, $fpubkey); + "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). |