From f48e0e776322ce0b9ec413acadf9b8864cecba9b Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 5 Feb 2001 17:12:35 +0000
Subject: rebuild URLPREFIX as stage1 does not provide it anymore.

---
 perl-install/ftp.pm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

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

diff --git a/perl-install/ftp.pm b/perl-install/ftp.pm
index 1c560fff7..4014eda10 100644
--- a/perl-install/ftp.pm
+++ b/perl-install/ftp.pm
@@ -11,17 +11,8 @@ my %hosts;
 1;
 
 sub fromEnv() {
-    # using URLPREFIX to find out information if kickstart
-    ($ENV{LOGIN}, $ENV{PASSWORD}, $ENV{HOST}, $ENV{PREFIX}) =
-      $ENV{URLPREFIX} =~ m|
-       ://
-       (?: ([^:]*)              # login
-           (?: :([^@]*))?       # password
-       @)?
-       ([^/]*)                	# host
-       /?(.*)			# prefix
-      |x unless $ENV{HOST};
-    
+    #- 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{qw(HOST PREFIX LOGIN PASSWORD)};
 }
 
-- 
cgit v1.2.1