From b9e13ee4d72156bf00cd48a8be4a58281842fcaf Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Tue, 15 Oct 2013 00:01:35 +0200 Subject: download: fix parsing download progress with rsync >= 3.10 rsync 3.10 now defaults to human readable output, with sizes being printed with a separator between group of 3 digits. This broke our download progress parser. We can fix this by using the --no-human-readable command line option, to get the old rsync progress output format. This option already existed in older rsync versions (tried in Mageia 2), so this change should be safe to include in backports of urpmi to older distributions. --- urpm/download.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'urpm') diff --git a/urpm/download.pm b/urpm/download.pm index 8284e81a..31a88264 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -586,7 +586,7 @@ sub sync_rsync { my $buf = ''; my $cmd = join(" ", "/usr/bin/rsync", ($limit_rate ? "--bwlimit=$limit_rate" : @{[]}), - ($options->{quiet} ? qw(-q) : qw(--progress -v)), + ($options->{quiet} ? qw(-q) : qw(--progress -v --no-human-readable)), ($options->{compress} ? qw(-z) : @{[]}), ($options->{ssh} ? qq(-e $options->{ssh}) : ("--timeout=$CONNECT_TIMEOUT", -- cgit v1.2.1