diff options
Diffstat (limited to 'Remote/Rsync/RsyncUrl.hs')
| -rw-r--r-- | Remote/Rsync/RsyncUrl.hs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Remote/Rsync/RsyncUrl.hs b/Remote/Rsync/RsyncUrl.hs index 61bbe2f3f..a7a2ac8f6 100644 --- a/Remote/Rsync/RsyncUrl.hs +++ b/Remote/Rsync/RsyncUrl.hs @@ -1,6 +1,6 @@ {- Rsync urls. - - - Copyright 2014 Joey Hess <joey@kitenet.net> + - Copyright 2014 Joey Hess <id@joeyh.name> - - Licensed under the GNU GPL version 3 or higher. -} @@ -14,10 +14,12 @@ import Locations import Utility.Rsync import Utility.SafeCommand +import Data.Default import System.FilePath.Posix #ifdef mingw32_HOST_OS import Data.String.Utils #endif +import Annex.DirHashes type RsyncUrl = String @@ -35,12 +37,12 @@ rsyncEscape o u | otherwise = u rsyncUrls :: RsyncOpts -> Key -> [RsyncUrl] -rsyncUrls o k = map use annexHashes +rsyncUrls o k = map use dirHashes where use h = rsyncUrl o </> hash h </> rsyncEscape o (f </> f) f = keyFile k #ifndef mingw32_HOST_OS - hash h = h k + hash h = h def k #else - hash h = replace "\\" "/" (h k) + hash h = replace "\\" "/" (h def k) #endif |