diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | urpm/mirrors.pm | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,6 @@ +- prefer http mirrors when using a mirrorlist, this avoids selecting an rsync + mirror which prevents aria2 from being used + Version 8.10 - 9 October 2015 - fix urpm::bug_report (mga#16925) diff --git a/urpm/mirrors.pm b/urpm/mirrors.pm index 295c92c6..888c411e 100644 --- a/urpm/mirrors.pm +++ b/urpm/mirrors.pm @@ -276,7 +276,9 @@ sub add_proximity_and_sort { $_->{proximity_corrected} *= _between_country_correction($country_code, $_->{country}) if $best; $_->{proximity_corrected} *= _between_continent_correction($best->{continent}, $_->{continent}) if $best; } - @$mirrors = sort { $a->{proximity_corrected} <=> $b->{proximity_corrected} } @$mirrors; + # prefer http mirrors by sorting them to the beginning + @$mirrors = sort { ($b->{url} =~ m!^http://!) <=> ($a->{url} =~ m!^http://!) + || $a->{proximity_corrected} <=> $b->{proximity_corrected} } @$mirrors; } # add +/- 5% random |