From 99aece0e3cda07180acff00156c90f1051228d75 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 10 Jul 2002 18:37:37 +0000
Subject: don't let Timeout kill us

---
 perl-install/ftp.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'perl-install/ftp.pm')

diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm
index 20b837b8c..c84ce66a6 100644
--- a/perl-install/ftp.pm
+++ b/perl-install/ftp.pm
@@ -53,7 +53,8 @@ sub getFile {
     $f eq 'XXX' and rewindGetFile(), return; #- special case to force closing connection.
     foreach (1..3) {
 	my ($ftp, $retr) = new(@para ? @para : fromEnv);
-	$$retr->close if $$retr;
+	eval { $$retr->close if $$retr };
+	$@ and rewindGetFile(); #- in case Timeout got us on "->close"
 	$$retr = $ftp->retr($f) and return $$retr;
 	($ftp->code == 550) and log::l("FTP: 550 file unavailable"), return;
 	rewindGetFile();
@@ -75,8 +76,9 @@ sub rewindGetFile() {
     #- close any existing connection.
     foreach (values %hosts) {
 	my ($ftp, $retr) = @{$_ || []};
-	$$retr->close if $$retr;
-	$ftp->close() if $ftp;
+	#- don't let Timeout kill us!
+	eval { $$retr->close } if $$retr;
+	eval { $ftp->close } if $ftp;
     }
 
     #- make sure to reconnect to server.
-- 
cgit v1.2.1