diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-11-11 15:01:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-11-11 15:01:13 -0400 |
| commit | 962e279e17c1f3cf3be49ffdfb5e7310711a220c (patch) | |
| tree | d9953d9e57dea51c24ccaf4d7e64731010546f4f /Utility/Rsync.hs | |
| parent | 7d7f93302c72cbe1a16598b0c90a49c10aaf3669 (diff) | |
| download | git-repair-962e279e17c1f3cf3be49ffdfb5e7310711a220c.tar.gz | |
merge from git-annex
Diffstat (limited to 'Utility/Rsync.hs')
| -rw-r--r-- | Utility/Rsync.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs index 3aaf928..d3fe981 100644 --- a/Utility/Rsync.hs +++ b/Utility/Rsync.hs @@ -54,16 +54,16 @@ rsyncUseDestinationPermissions = Param "--chmod=ugo=rwX" rsync :: [CommandParam] -> IO Bool rsync = boolSystem "rsync" . rsyncParamsFixup -{- On Windows, rsync is from Cygwin, and expects to get Cygwin formatted +{- On Windows, rsync is from msys2, and expects to get msys2 formatted - paths to files. (It thinks that C:foo refers to a host named "C"). - Fix up the Params appropriately. -} rsyncParamsFixup :: [CommandParam] -> [CommandParam] #ifdef mingw32_HOST_OS rsyncParamsFixup = map fixup where - fixup (File f) = File (toCygPath f) + fixup (File f) = File (toMSYS2Path f) fixup (Param s) - | rsyncUrlIsPath s = Param (toCygPath s) + | rsyncUrlIsPath s = Param (toMSYS2Path s) fixup p = p #else rsyncParamsFixup = id |