diff options
| author | Olivier Blin <dev@blino.org> | 2013-10-15 00:01:35 +0200 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2013-10-15 00:01:35 +0200 |
| commit | b9e13ee4d72156bf00cd48a8be4a58281842fcaf (patch) | |
| tree | 23c243e831c1bb9ba4af6d5146ec5ef98ca8bb0e | |
| parent | a4eccdec35b234a4cec448635204615d1043ad31 (diff) | |
| download | urpmi-b9e13ee4d72156bf00cd48a8be4a58281842fcaf.tar urpmi-b9e13ee4d72156bf00cd48a8be4a58281842fcaf.tar.gz urpmi-b9e13ee4d72156bf00cd48a8be4a58281842fcaf.tar.bz2 urpmi-b9e13ee4d72156bf00cd48a8be4a58281842fcaf.tar.xz urpmi-b9e13ee4d72156bf00cd48a8be4a58281842fcaf.zip | |
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.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | urpm/download.pm | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -1,3 +1,6 @@ +- library: + o fix parsing download progress with rsync >= 3.10 + Version 7.27.5 - 13 October 2013, by Colin Guthrie - use polkit for authorisation (mga#11125) 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", |