summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-09-07 12:55:36 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-09-07 12:55:36 +0000
commitd58e2e3a7ed1de49cb1ec8db7617df50b65b8957 (patch)
tree962b39559bd842a84bb94cab5c9c0b3054c8d3d4
parentf995d975017f1ae923e280b9ae618b0df5bed84c (diff)
downloaddrakx-d58e2e3a7ed1de49cb1ec8db7617df50b65b8957.tar
drakx-d58e2e3a7ed1de49cb1ec8db7617df50b65b8957.tar.gz
drakx-d58e2e3a7ed1de49cb1ec8db7617df50b65b8957.tar.bz2
drakx-d58e2e3a7ed1de49cb1ec8db7617df50b65b8957.tar.xz
drakx-d58e2e3a7ed1de49cb1ec8db7617df50b65b8957.zip
Install from a CD with a networked HTTP media : force reloading of
IO::Socket::INET after having brought up the network interface. It won't work otherwise (for mysterious reasons.)
-rw-r--r--perl-install/http.pm5
-rw-r--r--perl-install/install_any.pm2
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/http.pm b/perl-install/http.pm
index bce912120..407569be8 100644
--- a/perl-install/http.pm
+++ b/perl-install/http.pm
@@ -1,6 +1,5 @@
package http; # $Id$
-use IO::Socket;
use network::network;
@@ -19,6 +18,10 @@ 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 fc9f1c3da..7d7f40a45 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -465,7 +465,7 @@ sub selectSupplMedia {
} else {
my $url = $o->ask_from_entry('', N("URL of the mirror?")) or return '';
useMedium($medium_name);
- require "$suppl_method.pm";
+ require "$suppl_method.pm"; #- require http or ftp
#- first, try to find an hdlists file
eval { pkgs::psUsingHdlists($o, $suppl_method, $url, $o->{packages}, $medium_name, \&setup_suppl_medium) };
if ($@) {