diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:29:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:55:56 -0400 |
| commit | 2bba5bc22d049272d3328bfa6c452d3e2e50e86c (patch) | |
| tree | 19feab50e43dc330038224ea98b371916ca02133 /Upgrade/V1.hs | |
| parent | 014e909a449d0822eff4962a504d6a524abe8fc7 (diff) | |
made parentDir return a Maybe FilePath; removed most uses of it
parentDir is less safe than takeDirectory, especially when working
with relative FilePaths. It's really only useful in loops that
want to terminate at /
This commit was sponsored by Audric SCHILTKNECHT.
Diffstat (limited to 'Upgrade/V1.hs')
| -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 347b102ac..7113509fe 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 = parentDir f + let d = takeDirectory 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 (parentDir dest) + liftIO $ createDirectoryIfMissing True (takeDirectory 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 |