summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-02-05 17:12:35 +0000
committerFrancois Pons <fpons@mandriva.com>2001-02-05 17:12:35 +0000
commitf48e0e776322ce0b9ec413acadf9b8864cecba9b (patch)
tree890196dfa9cdcd38b0b74514db5c5870e6fc8030
parent6c65aff2ab2409193d1d6fc5eded0f62b7d376b0 (diff)
downloaddrakx-f48e0e776322ce0b9ec413acadf9b8864cecba9b.tar
drakx-f48e0e776322ce0b9ec413acadf9b8864cecba9b.tar.gz
drakx-f48e0e776322ce0b9ec413acadf9b8864cecba9b.tar.bz2
drakx-f48e0e776322ce0b9ec413acadf9b8864cecba9b.tar.xz
drakx-f48e0e776322ce0b9ec413acadf9b8864cecba9b.zip
rebuild URLPREFIX as stage1 does not provide it anymore.
-rw-r--r--perl-install/ftp.pm13
1 files changed, 2 insertions, 11 deletions
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)};
}