Windows: Fix local rsync filepath munging (fixes 26 test suite failures).

This commit is contained in:
Joey Hess 2014-12-30 13:57:49 -04:00
parent 6b3d0cb11a
commit 5b30ba63cd
2 changed files with 2 additions and 1 deletions

View file

@ -87,7 +87,7 @@ rsyncUrlIsPath s
- The params must enable rsync's --progress mode for this to work. - The params must enable rsync's --progress mode for this to work.
-} -}
rsyncProgress :: MeterUpdate -> [CommandParam] -> IO Bool 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 {- Strategy: Look for chunks prefixed with \r (rsync writes a \r before
- the first progress output, and each thereafter). The first number - the first progress output, and each thereafter). The first number

1
debian/changelog vendored
View file

@ -8,6 +8,7 @@ git-annex (5.20141220) UNRELEASED; urgency=medium
the command. Amoung other fixes, this means that addurl will stage the command. Amoung other fixes, this means that addurl will stage
added files even if adding one of the urls fails. added files even if adding one of the urls fails.
* bittorrent: Fix locking problem when using addurl file:// * 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 -- Joey Hess <id@joeyh.name> Mon, 22 Dec 2014 15:16:38 -0400