summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-08 11:54:22 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-08 11:54:22 +0000
commit92bea30b70696f9e1f6e68a037acf70ac48a5d99 (patch)
treef9b6c4ee93309c41048c3c516d58c1c6e747920a
parentf1c5acfa0a593ef6ac6cac6fa8d7fbaf7e8600af (diff)
downloaddrakx-92bea30b70696f9e1f6e68a037acf70ac48a5d99.tar
drakx-92bea30b70696f9e1f6e68a037acf70ac48a5d99.tar.gz
drakx-92bea30b70696f9e1f6e68a037acf70ac48a5d99.tar.bz2
drakx-92bea30b70696f9e1f6e68a037acf70ac48a5d99.tar.xz
drakx-92bea30b70696f9e1f6e68a037acf70ac48a5d99.zip
(get_file_and_size) just use curl for ftp retrieval, like for http
-rw-r--r--perl-install/install/media.pm5
1 files changed, 1 insertions, 4 deletions
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 082bb4457..0edfb8ab0 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -345,10 +345,7 @@ sub get_file_and_size {
if ($f =~ m|^http://|) {
require install::http;
install::http::get_file_and_size($f);
- } elsif ($phys_m->{method} eq "ftp") {
- require install::ftp;
- install::ftp::get_file_and_size($f, $phys_m->{url});
- } elsif ($phys_m->{method} eq "http") {
+ } elsif (member($phys_m->{method}, qw(ftp http))) {
require install::http;
install::http::get_file_and_size_($f, $phys_m->{url});
} elsif ($f =~ m!^/!) {