summaryrefslogtreecommitdiff
path: root/Init.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-18 18:20:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-18 18:20:20 -0400
commitf329c56f5e356bfaaf04d0587058824713d9b1c9 (patch)
treea2e099715eddf9120b388ce5de36c5db814181b5 /Init.hs
parent891868cf0185b8a1b81a8a39cd88ce2e00cdc338 (diff)
Ensure that core.sharedrepository is honored when creating the .git/annex directory.
Diffstat (limited to 'Init.hs')
-rw-r--r--Init.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Init.hs b/Init.hs
index 453ad5ae9..ad1803995 100644
--- a/Init.hs
+++ b/Init.hs
@@ -29,6 +29,7 @@ import Config
import Annex.Direct
import Annex.Content.Direct
import Annex.Environment
+import Annex.Perms
import Backend
#ifndef mingw32_HOST_OS
import Utility.UserInfo
@@ -111,9 +112,8 @@ probeCrippledFileSystem = do
#else
tmp <- fromRepo gitAnnexTmpDir
let f = tmp </> "gaprobe"
- liftIO $ do
- createDirectoryIfMissing True tmp
- writeFile f ""
+ createAnnexDirectory tmp
+ liftIO $ writeFile f ""
uncrippled <- liftIO $ probe f
liftIO $ removeFile f
return $ not uncrippled
@@ -149,8 +149,8 @@ probeFifoSupport = do
#else
tmp <- fromRepo gitAnnexTmpDir
let f = tmp </> "gaprobe"
+ createAnnexDirectory tmp
liftIO $ do
- createDirectoryIfMissing True tmp
nukeFile f
ms <- tryIO $ do
createNamedPipe f ownerReadMode