diff options
| -rw-r--r-- | Utility/Rsync.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs index bbe1a4236..b314df14e 100644 --- a/Utility/Rsync.hs +++ b/Utility/Rsync.hs @@ -87,7 +87,7 @@ rsyncUrlIsPath s - The params must enable rsync's --progress mode for this to work. -} rsyncProgress :: MeterUpdate -> [CommandParam] -> IO Bool -rsyncProgress meterupdate = commandMeter parseRsyncProgress meterupdate "rsync" +rsyncProgress meterupdate = commandMeter parseRsyncProgress meterupdate "rsync" . rsyncParamsFixup {- Strategy: Look for chunks prefixed with \r (rsync writes a \r before - the first progress output, and each thereafter). The first number diff --git a/debian/changelog b/debian/changelog index e3bf961c2..4f10dd333 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ git-annex (5.20141220) UNRELEASED; urgency=medium the command. Amoung other fixes, this means that addurl will stage added files even if adding one of the urls fails. * bittorrent: Fix locking problem when using addurl file:// + * Windows: Fix local rsync filepath munging (fixes 26 test suite failures). -- Joey Hess <id@joeyh.name> Mon, 22 Dec 2014 15:16:38 -0400 |