summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--urpm/download.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 60f4587c..f65b10da 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
- add infrastructure for rpmdrake (#920)
- add infrastructure so that GUIes can offer not to ask anymore about missing
or bad packages
+- use rsync to download from rsync-mirrors (Alexander Barakin, mga#2518)
Version 6.40 - 07 May 2010
diff --git a/urpm/download.pm b/urpm/download.pm
index d7cb908c..bfe4139b 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -956,6 +956,8 @@ sub _sync_webfetch_raw {
my @l = map { urpm::file_from_local_url($_) } @$files;
eval { sync_file($options, @l) };
$urpm->{fatal}(10, $@) if $@;
+ } elsif ($proto eq 'rsync') {
+ sync_rsync($options, @$files);
} elsif (member($proto, 'ftp', 'http', 'https') || $options->{metalink}) {
my $preferred = preferred_downloader($urpm, $medium, \$options->{metalink});
@@ -973,8 +975,6 @@ sub _sync_webfetch_raw {
$sync->($options, splice(@l, 0, $n));
}
}
- } elsif ($proto eq 'rsync') {
- sync_rsync($options, @$files);
} elsif ($proto eq 'ssh') {
my @ssh_files = map { m!^ssh://([^/]*)(.*)! ? "$1:$2" : () } @$files;
sync_ssh($options, @ssh_files);