From b65c4a063d559fa0ed9394f693d126db09879405 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Wed, 8 Sep 2004 01:21:14 +0000
Subject: Better version of the reload-IO::Socket patch

---
 perl-install/http.pm        | 6 +-----
 perl-install/install_any.pm | 5 +++++
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/http.pm b/perl-install/http.pm
index 407569be8..8c19c104a 100644
--- a/perl-install/http.pm
+++ b/perl-install/http.pm
@@ -1,8 +1,8 @@
 package http; # $Id$
 
+use IO::Socket;
 use network::network;
 
-
 my $sock;
 
 sub getFile {
@@ -18,10 +18,6 @@ sub getFile {
 
     my $use_http_proxy = $ENV{PROXY} && $ENV{PROXYPORT};
 
-    delete $INC{'IO/Socket.pm'};
-    delete $INC{'IO/Socket/UNIX.pm'};
-    delete $INC{'IO/Socket/INET.pm'};
-    require IO::Socket;
     $sock = IO::Socket::INET->new(PeerAddr => $use_http_proxy ? $ENV{PROXY} : $host,
 				  PeerPort => $use_http_proxy ? $ENV{PROXYPORT} : $port || 80,
 				  Proto    => 'tcp',
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 7d7f40a45..4d37e6c1f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -423,6 +423,11 @@ sub selectSupplMedia {
 	    network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1);
 	    require install_interactive;
 	    install_interactive::upNetwork($o);
+	    #- force reinitialisation of network modules
+	    delete $INC{'IO/Socket.pm'};
+	    delete $INC{'IO/Socket/UNIX.pm'};
+	    delete $INC{'IO/Socket/INET.pm'};
+	    require IO::Socket;
 	}
 	my $main_method = $o->{method};
 	local $o->{method} = $suppl_method;
-- 
cgit v1.2.1