From a1b69cf20a8c8693530da4ebda227b8e010d5b1e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 7 Jan 2001 00:40:28 +0000
Subject: for the moment, just release cdrom.img, hd.img and hdreiser.img
 others should should come...

---
 perl-install/ftp.pm           | 14 ++++++++++----
 perl-install/install_steps.pm |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm
index 669ed4fcb..14ef68bf0 100644
--- a/perl-install/ftp.pm
+++ b/perl-install/ftp.pm
@@ -27,9 +27,12 @@ sub fromEnv() {
 
 sub new {
     my ($host, $prefix, $login, $password) = @_;
+    log::l("ftp::new");
     my @l = do { if ($hosts{"$host$prefix"}) {
+	log::l("ftp::new 1");
 	@{$hosts{"$host$prefix"}};
     } else {
+	log::l("ftp::new 2");
 	my %options = (Passive => 1, Timeout => 60, Port => 21);
 	$options{Firewall} = $ENV{PROXY} if $ENV{PROXY};
 	$options{Port} = $ENV{PROXYPORT} if $ENV{PROXYPORT};
@@ -40,6 +43,7 @@ sub new {
 
 	my $ftp;
 	while (1) {
+	    log::l("ftp::new 3");
 	    $ftp = Net::FTP->new(network::resolv($host), %options) or die;
 	    $ftp && $ftp->login($login, $password) and last;
 
@@ -58,10 +62,12 @@ sub new {
 
 sub getFile {
     my ($f, @para) = @_;
-    my ($ftp, $retr) = new(@para ? @para : fromEnv);
-    $$retr->close if $$retr;
-    $$retr   = $ftp->retr($f) or do { rewindGetFile(); goto &getFile };
-    $$retr ||= $ftp->retr($f);
+    foreach (1..2) {
+	my ($ftp, $retr) = new(@para ? @para : fromEnv);
+	$$retr->close if $$retr;
+	$$retr = $ftp->retr($f) and return $$retr;
+	rewindGetFile();
+    }
 }
 
 #-sub closeFiles() {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 9340739f2..a080cd337 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -423,7 +423,7 @@ Consoles 1,3,4,7 may also contain interesting information";
 
     if ($o->{pcmcia}) {
 	substInFile { s/.*(TaskBarShowAPMStatus).*/$1=1/ } "$o->{prefix}/usr/lib/X11/icewm/preferences";
-	eval { commands::cp("$o->{prefix}/usr/share/applnk/System/kapm.kdelnk", 
+	eval { commands::cp("$o->{prefix}/usr/share/applnk/System/kapm.kdelnk",
 			    "$o->{prefix}/etc/skel/Desktop/Autostart/kapm.kdelnk") };
     }
 
-- 
cgit v1.2.1