summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-02-08 19:01:10 +0000
committerFrancois Pons <fpons@mandriva.com>2001-02-08 19:01:10 +0000
commit2a1700220ab3014ed58932d648ba6186c66fded1 (patch)
tree889a29fd08484d764f81f8e918d4bc410fd41666
parent1e68d6761eb4a0db97ca0c85f28a575d4c09a90b (diff)
downloaddrakx-backup-do-not-use-2a1700220ab3014ed58932d648ba6186c66fded1.tar
drakx-backup-do-not-use-2a1700220ab3014ed58932d648ba6186c66fded1.tar.gz
drakx-backup-do-not-use-2a1700220ab3014ed58932d648ba6186c66fded1.tar.bz2
drakx-backup-do-not-use-2a1700220ab3014ed58932d648ba6186c66fded1.tar.xz
drakx-backup-do-not-use-2a1700220ab3014ed58932d648ba6186c66fded1.zip
fixed wrong URLPREFIX formation if no user given.
-rw-r--r--perl-install/ftp.pm3
1 files changed, 2 insertions, 1 deletions
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)};
}