From ac140162850d0bdbb9d1677e77c931e8e17999b1 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Mon, 4 Aug 2003 22:00:10 +0000 Subject: =?UTF-8?q?don't=20have=20two=20/=20in=20the=20urpmi=20url=20or=20?= =?UTF-8?q?it=20seems=20it=20causes=20problems=20for=20some=20people=20(so?= =?UTF-8?q?me=20ftp=20servers=3F=20wget/curl=3F=20proxy=3F=20no=20s=C3=A9.?= =?UTF-8?q?.)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- perl-install/ftp.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)}; } -- cgit v1.2.1