diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
| commit | 425bc1107aebdb701cdcee44da731dd918cd470d (patch) | |
| tree | 25bcacb37277b70aa7bd0caaf0fe7c3edc665653 /Remote/Directory.hs | |
| parent | 20c7644a4d85434cf49840ea92fca0c723710c72 (diff) | |
revert parentDir change
Reverts 2bba5bc22d049272d3328bfa6c452d3e2e50e86c
Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
Diffstat (limited to 'Remote/Directory.hs')
| -rw-r--r-- | Remote/Directory.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 1d9a15ea5..66a3de49f 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -143,7 +143,7 @@ finalizeStoreGeneric :: FilePath -> FilePath -> IO () finalizeStoreGeneric tmp dest = do void $ tryIO $ allowWrite dest -- may already exist void $ tryIO $ removeDirectoryRecursive dest -- or not exist - createDirectoryIfMissing True (takeDirectory dest) + createDirectoryIfMissing True (parentDir dest) renameDirectory tmp dest -- may fail on some filesystems void $ tryIO $ do |