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 /Command/Unlock.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 'Command/Unlock.hs')
| -rw-r--r-- | Command/Unlock.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Unlock.hs b/Command/Unlock.hs index 75df99332..56c4f1dc0 100644 --- a/Command/Unlock.hs +++ b/Command/Unlock.hs @@ -46,7 +46,7 @@ perform dest key = ifM (checkDiskSpace Nothing key 0) ( do src <- calcRepo $ gitAnnexLocation key tmpdest <- fromRepo $ gitAnnexTmpObjectLocation key - liftIO $ createDirectoryIfMissing True (takeDirectory tmpdest) + liftIO $ createDirectoryIfMissing True (parentDir tmpdest) showAction "copying" ifM (liftIO $ copyFileExternal CopyAllMetaData src tmpdest) ( do |