summaryrefslogtreecommitdiff
path: root/Annex/Perms.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-18 18:05:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-18 18:13:09 -0400
commit891868cf0185b8a1b81a8a39cd88ce2e00cdc338 (patch)
tree42173433755ea7c36473fc858d46ce48a3c4a126 /Annex/Perms.hs
parent72bd1369cd32320bb268b16b97032b1f11b33edc (diff)
Ensure execute bit is set on directories when core.sharedrepsitory is set.
Diffstat (limited to 'Annex/Perms.hs')
-rw-r--r--Annex/Perms.hs28
1 files changed, 18 insertions, 10 deletions
diff --git a/Annex/Perms.hs b/Annex/Perms.hs
index 9ce0fe2a6..e3a2fa65a 100644
--- a/Annex/Perms.hs
+++ b/Annex/Perms.hs
@@ -6,7 +6,8 @@
-}
module Annex.Perms (
- setAnnexPerm,
+ setAnnexFilePerm,
+ setAnnexDirPerm,
annexFileMode,
createAnnexDirectory,
noUmask,
@@ -33,17 +34,27 @@ withShared a = maybe startup a =<< Annex.getState Annex.shared
Annex.changeState $ \s -> s { Annex.shared = Just shared }
a shared
+setAnnexFilePerm :: FilePath -> Annex ()
+setAnnexFilePerm = setAnnexPerm False
+
+setAnnexDirPerm :: FilePath -> Annex ()
+setAnnexDirPerm = setAnnexPerm True
+
{- Sets appropriate file mode for a file or directory in the annex,
- other than the content files and content directory. Normally,
- use the default mode, but with core.sharedRepository set,
- allow the group to write, etc. -}
-setAnnexPerm :: FilePath -> Annex ()
-setAnnexPerm file = unlessM crippledFileSystem $
+setAnnexPerm :: Bool -> FilePath -> Annex ()
+setAnnexPerm isdir file = unlessM crippledFileSystem $
withShared $ liftIO . go
where
- go GroupShared = groupWriteRead file
+ go GroupShared = modifyFileMode file $ addModes $
+ groupSharedModes ++
+ if isdir then [ ownerExecuteMode, groupExecuteMode ] else []
go AllShared = modifyFileMode file $ addModes $
- [ ownerWriteMode, groupWriteMode ] ++ readModes
+ readModes ++
+ [ ownerWriteMode, groupWriteMode ] ++
+ if isdir then executeModes else []
go _ = noop
{- Gets the appropriate mode to use for creating a file in the annex
@@ -54,10 +65,7 @@ annexFileMode = withShared $ return . go
go GroupShared = sharedmode
go AllShared = combineModes (sharedmode:readModes)
go _ = stdFileMode
- sharedmode = combineModes
- [ ownerWriteMode, groupWriteMode
- , ownerReadMode, groupReadMode
- ]
+ sharedmode = combineModes groupSharedModes
{- Creates a directory inside the gitAnnexDir, including any parent
- directories. Makes directories with appropriate permissions. -}
@@ -74,7 +82,7 @@ createAnnexDirectory dir = traverse dir [] =<< top
where
done = forM_ below $ \p -> do
liftIO $ createDirectoryIfMissing True p
- setAnnexPerm p
+ setAnnexDirPerm p
{- Blocks writing to the directory an annexed file is in, to prevent the
- file accidentially being deleted. However, if core.sharedRepository