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 /Upgrade | |
| 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 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index 7113509fe..347b102ac 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -73,7 +73,7 @@ moveContent = do where move f = do let k = fileKey1 (takeFileName f) - let d = takeDirectory f + let d = parentDir f liftIO $ allowWrite d liftIO $ allowWrite f moveAnnex k f @@ -114,7 +114,7 @@ moveLocationLogs = do dest <- fromRepo $ logFile2 k dir <- fromRepo Upgrade.V2.gitStateDir let f = dir </> l - liftIO $ createDirectoryIfMissing True (takeDirectory dest) + liftIO $ createDirectoryIfMissing True (parentDir dest) -- could just git mv, but this way deals with -- log files that are not checked into git, -- as well as merging with already upgraded |