diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-10-26 12:55:17 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-10-26 12:55:17 +0000 |
| commit | 89ec7a1ae086d06c2e2db02bde14567b613f5a7c (patch) | |
| tree | bda74e274998fde1ee94c9c974cdb8e521f77ad3 /perl-install/install_any.pm | |
| parent | 700a5ac9b2046020f41db7675c45df76d6e8f89d (diff) | |
| download | drakx-89ec7a1ae086d06c2e2db02bde14567b613f5a7c.tar drakx-89ec7a1ae086d06c2e2db02bde14567b613f5a7c.tar.gz drakx-89ec7a1ae086d06c2e2db02bde14567b613f5a7c.tar.bz2 drakx-89ec7a1ae086d06c2e2db02bde14567b613f5a7c.tar.xz drakx-89ec7a1ae086d06c2e2db02bde14567b613f5a7c.zip | |
help perl_checker
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 2ac679a16..99a64701b 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -501,7 +501,7 @@ sub selectSupplMedia { local $global_ftp_prefix; if ($suppl_method eq 'ftp') { #- mirrors are ftp only (currently) $url = $o->askSupplMirror(N("URL of the mirror?")) or return 'error'; - $url =~ m!^ftp://(?:(.*?)(?::(.*?))?@)?([^/]+)/(.*)! + $url =~ m!^ftp://(?:(.*?)(?::(.*?))?\@)?([^/]+)/(.*)! and $global_ftp_prefix = [ $3, $4, $1, $2 ]; #- for getFile } else { $url = $o->ask_from_entry('', N("URL of the mirror?")) or return 'error'; @@ -571,7 +571,7 @@ sub setup_suppl_medium { my ($supplmedium, $url, $suppl_method) = @_; $supplmedium->{prefix} = $url; #- for install_urpmi if ($suppl_method eq 'ftp') { - $url =~ m!^ftp://(?:(.*?)(?::(.*?))?@)?([^/]+)/(.*)! + $url =~ m!^ftp://(?:(.*?)(?::(.*?))?\@)?([^/]+)/(.*)! and $supplmedium->{ftp_prefix} = [ $3, $4, $1, $2 ]; #- for getFile } $supplmedium->{selected} = 1; |