From 2a1700220ab3014ed58932d648ba6186c66fded1 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 8 Feb 2001 19:01:10 +0000
Subject: fixed wrong URLPREFIX formation if no user given.

---
 perl-install/ftp.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/ftp.pm')

diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm
index 7784bb529..e1eeca7a4 100644
--- a/perl-install/ftp.pm
+++ b/perl-install/ftp.pm
@@ -12,7 +12,8 @@ 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{PASSWORD} && ":$ENV{PASSWORD}") . '@' . "$ENV{HOST}/$ENV{PREFIX}";
+    $ENV{URLPREFIX} = "ftp://" . ($ENV{LOGIN} && ("$ENV{LOGIN}" . ($ENV{PASSWORD} && ":$ENV{PASSWORD}") . '@')) .
+      "$ENV{HOST}/$ENV{PREFIX}";
     @ENV{qw(HOST PREFIX LOGIN PASSWORD)};
 }
 
-- 
cgit v1.2.1