summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-03-05 15:19:05 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-03-05 15:19:05 +0000
commitca30742650219ef9146f85f6afe8ac5abbde8aa7 (patch)
tree6120899dd2f3ed5a109987b4d1e0b08374843feb
parentf0d6d3b0830907b9a326b410fce82e433be637fa (diff)
downloaddrakx-ca30742650219ef9146f85f6afe8ac5abbde8aa7.tar
drakx-ca30742650219ef9146f85f6afe8ac5abbde8aa7.tar.gz
drakx-ca30742650219ef9146f85f6afe8ac5abbde8aa7.tar.bz2
drakx-ca30742650219ef9146f85f6afe8ac5abbde8aa7.tar.xz
drakx-ca30742650219ef9146f85f6afe8ac5abbde8aa7.zip
fix bug in generating automatic stage1
params for http
-rw-r--r--perl-install/install_any.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index f94756cdd..934e7aa09 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -838,7 +838,7 @@ sub generate_automatic_stage1_params {
my @ks = "method:$o->{method}";
if ($o->{method} =~ /http/) {
- "$ENV{URLPREFIX}" =~ m|http://(.*)/(.*)| or die;
+ "$ENV{URLPREFIX}" =~ m|http://([^/:]+)/(.*)| or die;
push @ks, "server:$1", "directory:$2";
} elsif ($o->{method} =~ /ftp/) {
push @ks, "server:$ENV{HOST}", "directory:$ENV{PREFIX}", "user:$ENV{LOGIN}", "pass:$ENV{PASSWORD}";