summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-08-04 22:00:10 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-08-04 22:00:10 +0000
commitac140162850d0bdbb9d1677e77c931e8e17999b1 (patch)
treee225e7206de0f92d0ab7f7f7c0fd0d82f2d65a66 /perl-install
parent9597583f421d4bf17d291e9a2321323fdd26d25c (diff)
downloaddrakx-ac140162850d0bdbb9d1677e77c931e8e17999b1.tar
drakx-ac140162850d0bdbb9d1677e77c931e8e17999b1.tar.gz
drakx-ac140162850d0bdbb9d1677e77c931e8e17999b1.tar.bz2
drakx-ac140162850d0bdbb9d1677e77c931e8e17999b1.tar.xz
drakx-ac140162850d0bdbb9d1677e77c931e8e17999b1.zip
don't have two / in the urpmi url or it seems it causes problems
for some people (some ftp servers? wget/curl? proxy? no sé..)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ftp.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm
index c971898a1..7f30daa69 100644
--- a/perl-install/ftp.pm
+++ b/perl-install/ftp.pm
@@ -12,7 +12,7 @@ my %hosts;
sub fromEnv() {
#- now URLPREFIX is generated from what is given by mdk-stage1 which is only this 4 variables.
$ENV{URLPREFIX} = "ftp://" . ($ENV{LOGIN} && ($ENV{LOGIN} . ($ENV{PASSWORD} && ":$ENV{PASSWORD}") . '@')) .
- "$ENV{HOST}/$ENV{PREFIX}";
+ $ENV{HOST} . ($ENV{PREFIX} =~ m|^/| || '/') . $ENV{PREFIX};
@ENV{qw(HOST PREFIX LOGIN PASSWORD)};
}