From 425bc1107aebdb701cdcee44da731dd918cd470d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 Jan 2015 13:11:56 -0400 Subject: 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. --- Annex/Content/Direct.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Annex/Content/Direct.hs') diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs index 43defdca3..c09a08f0d 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 (takeDirectory (sentinalFile s)) + createAnnexDirectory (parentDir (sentinalFile s)) liftIO $ writeSentinalFile s where alreadyexists = liftIO. sentinalFileExists =<< annexSentinalFile -- cgit v1.2.3