summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-04 09:45:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-04 09:45:32 +0000
commit97d6e91a63b23d2a8029385932603f0bff8aae0d (patch)
treed6b856e2ded4f17791f11d0bf0ccfd30a4872247
parent51313dd1931e48290004291476d4afde1a6db5f5 (diff)
downloadurpmi-97d6e91a63b23d2a8029385932603f0bff8aae0d.tar
urpmi-97d6e91a63b23d2a8029385932603f0bff8aae0d.tar.gz
urpmi-97d6e91a63b23d2a8029385932603f0bff8aae0d.tar.bz2
urpmi-97d6e91a63b23d2a8029385932603f0bff8aae0d.tar.xz
urpmi-97d6e91a63b23d2a8029385932603f0bff8aae0d.zip
- remove rsync mirrors when calling aria2
-rw-r--r--NEWS1
-rw-r--r--urpm/download.pm6
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f94181b4..48abe885 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- remove rsync mirrors when calling aria2
- gurpmi, gurpmi2:
o silence perl warnings (ie remove "use warnings")
diff --git a/urpm/download.pm b/urpm/download.pm
index 1d254bc4..108e829c 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -914,7 +914,11 @@ sub _create_metalink_ {
# only use the 8 best mirrors, then we let aria2 choose
require urpm::mirrors;
- my @mirrors = map { _take_n_elem(8, @$_) } urpm::mirrors::list_urls($urpm, $medium, '');
+ my @mirrors = map {
+ # aria2 doesn't handle rsync
+ my @l = grep { urpm::protocol_from_url($_->{url}) ne 'rsync' } @$_;
+ _take_n_elem(16, @l);
+ } urpm::mirrors::list_urls($urpm, $medium, '');
my $metalinkfile = "$urpm->{cachedir}/$options->{media}.metalink";
# Even if not required by metalink spec, this line is needed at top of