summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-09-08 01:21:14 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-09-08 01:21:14 +0000
commitb65c4a063d559fa0ed9394f693d126db09879405 (patch)
tree8d7504e1716627c534b3fc123820dbb7ef552007 /perl-install
parentd58e2e3a7ed1de49cb1ec8db7617df50b65b8957 (diff)
downloaddrakx-backup-do-not-use-b65c4a063d559fa0ed9394f693d126db09879405.tar
drakx-backup-do-not-use-b65c4a063d559fa0ed9394f693d126db09879405.tar.gz
drakx-backup-do-not-use-b65c4a063d559fa0ed9394f693d126db09879405.tar.bz2
drakx-backup-do-not-use-b65c4a063d559fa0ed9394f693d126db09879405.tar.xz
drakx-backup-do-not-use-b65c4a063d559fa0ed9394f693d126db09879405.zip
Better version of the reload-IO::Socket patch
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/http.pm6
-rw-r--r--perl-install/install_any.pm5
2 files changed, 6 insertions, 5 deletions
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;