summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-12 15:16:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-12 15:16:17 +0000
commit6d7e43b7b344bb699d8b4bf8582b8b95075aee9a (patch)
tree0b69c0f432d2cdbb55c07786e1f766accc6eda1b
parentc1cc1295ac2442caa587b7f90692e49ea31050a4 (diff)
downloaddrakx-6d7e43b7b344bb699d8b4bf8582b8b95075aee9a.tar
drakx-6d7e43b7b344bb699d8b4bf8582b8b95075aee9a.tar.gz
drakx-6d7e43b7b344bb699d8b4bf8582b8b95075aee9a.tar.bz2
drakx-6d7e43b7b344bb699d8b4bf8582b8b95075aee9a.tar.xz
drakx-6d7e43b7b344bb699d8b4bf8582b8b95075aee9a.zip
allow ftp_proxy beginning with http: (thanks to Christophe Combelles)
-rw-r--r--perl-install/proxy.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/proxy.pm b/perl-install/proxy.pm
index 72fd35664..c8fab5d90 100644
--- a/perl-install/proxy.pm
+++ b/perl-install/proxy.pm
@@ -61,8 +61,8 @@ sub main {
{ label => _("port"), val => \$proxy_cfg->{ftp_port} }
],
complete => sub {
- if ($proxy_cfg->{ftp_url} && $proxy_cfg->{ftp_url} !~ /^ftp:/) {
- $in->ask_warn('', _("Url should begin with 'ftp:'"));
+ if ($proxy_cfg->{ftp_url} && $proxy_cfg->{ftp_url} !~ /^(ftp|http):/) {
+ $in->ask_warn('', _("Url should begin with 'ftp:' or 'http:'"));
return (1,0);
}
if ($proxy_cfg->{ftp_port} && $proxy_cfg->{ftp_port} !~ /^\d+$/) {