summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-14 17:02:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-14 17:02:56 +0000
commit2e77323a8efb1fd7869bb69746d7b1d048ceb58e (patch)
tree8e9a0afebf94506bd6c7c2f6706819fc8f7cbbb0
parent5b484bff16baf7a86371a2b17864fc3e60e375d8 (diff)
downloadurpmi-2e77323a8efb1fd7869bb69746d7b1d048ceb58e.tar
urpmi-2e77323a8efb1fd7869bb69746d7b1d048ceb58e.tar.gz
urpmi-2e77323a8efb1fd7869bb69746d7b1d048ceb58e.tar.bz2
urpmi-2e77323a8efb1fd7869bb69746d7b1d048ceb58e.tar.xz
urpmi-2e77323a8efb1fd7869bb69746d7b1d048ceb58e.zip
use aria2 even if nearest mirror is rsync
-rw-r--r--NEWS1
-rw-r--r--urpm/download.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6ed13547..d8ac5df4 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
- aria2:
o do not use --max-file-not-found=3 when downloading rpms
(since rpms are "versioned")
+ o use it even if nearest mirror is rsync
Version 6.16 - 8 October 2008
diff --git a/urpm/download.pm b/urpm/download.pm
index e8c5a950..14c0b753 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -905,7 +905,7 @@ sub _sync_webfetch_raw {
my @l = map { urpm::file_from_local_url($_) } @$files;
eval { sync_file($options, @l) };
$urpm->{fatal}(10, $@) if $@;
- } elsif (member($proto, 'ftp', 'http', 'https')) {
+ } elsif (member($proto, 'ftp', 'http', 'https') || $options->{metalink}) {
my $preferred = preferred_downloader($urpm, $medium, \$options->{metalink});