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 /Annex/Content | |
| 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 'Annex/Content')
| -rw-r--r-- | Annex/Content/Direct.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs index d9e1535f3..a2df9f6d3 100644 --- a/Annex/Content/Direct.hs +++ b/Annex/Content/Direct.hs @@ -247,7 +247,7 @@ sentinalStatus = maybe check return =<< Annex.getState Annex.sentinalstatus createInodeSentinalFile :: Annex () createInodeSentinalFile = unlessM (alreadyexists <||> hasobjects) $ do s <- annexSentinalFile - createAnnexDirectory (parentDir (sentinalFile s)) + createAnnexDirectory (takeDirectory (sentinalFile s)) liftIO $ writeSentinalFile s where alreadyexists = liftIO. sentinalFileExists =<< annexSentinalFile |