diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-28 18:01:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-28 18:05:08 -0400 |
| commit | ed3c22b16a0652b591165ab7575b06b356ca7f0a (patch) | |
| tree | 8cd063846b51f7f11130e1d2a953f0600c2bc6df | |
| parent | ff8a0b0b73685283aedf6d49cdd9b27f22fe6e9f (diff) | |
test suite found a problem with today's work
". def" did not do what I thought it would, at all.
| -rw-r--r-- | Locations.hs | 2 | ||||
| -rw-r--r-- | Remote/Rsync.hs | 4 | ||||
| -rw-r--r-- | Remote/Rsync/RsyncUrl.hs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Locations.hs b/Locations.hs index a9847f460..c5221d8bc 100644 --- a/Locations.hs +++ b/Locations.hs @@ -426,4 +426,4 @@ keyPath key hasher = hasher key </> f </> f - special remotes and git-annex repos. -} keyPaths :: Key -> [FilePath] -keyPaths key = map (keyPath key . def) dirHashes +keyPaths key = map (\h -> keyPath key (h def)) dirHashes diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index da258551b..f5d4c85c4 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -213,8 +213,8 @@ remove o k = do - content could be. Note that the parent directories have - to also be explicitly included, due to how rsync - traverses directories. -} - includes = concatMap (use .def) dirHashes - use h = let dir = h k in + includes = concatMap use dirHashes + use h = let dir = h def k in [ parentDir dir , dir -- match content directory and anything in it diff --git a/Remote/Rsync/RsyncUrl.hs b/Remote/Rsync/RsyncUrl.hs index 0cb1733c6..9a7319246 100644 --- a/Remote/Rsync/RsyncUrl.hs +++ b/Remote/Rsync/RsyncUrl.hs @@ -37,12 +37,12 @@ rsyncEscape o u | otherwise = u rsyncUrls :: RsyncOpts -> Key -> [RsyncUrl] -rsyncUrls o k = map (use . def) dirHashes +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) #endif |