summaryrefslogtreecommitdiff
path: root/Command/Fsck.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-28 16:19:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-28 16:19:20 -0400
commit0956f0dd15f3114d7227787578499210f0c17db8 (patch)
tree6ba30e31f661a79e36ebabe6710ef5bccd120abb /Command/Fsck.hs
parentcf99575d74d2a68004efa152ea9e7ac1c2866935 (diff)
fsck: Ensure that files and directories in .git/annex/objects have proper permissions.
Diffstat (limited to 'Command/Fsck.hs')
-rw-r--r--Command/Fsck.hs11
1 files changed, 10 insertions, 1 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 216c87493..bedb9fb99 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -7,6 +7,7 @@
module Command.Fsck where
+import Control.Monad (when)
import Control.Monad.State (liftIO)
import Command
@@ -18,6 +19,7 @@ import Messages
import Utility
import Content
import LocationLog
+import Locations
command :: [Command]
command = [repoCommand "fsck" (paramOptional $ paramRepeating paramPath) seek
@@ -47,9 +49,16 @@ perform key file backend numcopies = do
in this repository only. -}
verifyLocationLog :: Key -> FilePath -> Annex Bool
verifyLocationLog key file = do
+ g <- Annex.gitRepo
present <- inAnnex key
- g <- Annex.gitRepo
+ -- Since we're checking that a key's file is present, throw
+ -- in a permission fixup here too.
+ when present $ liftIO $ do
+ let f = gitAnnexLocation g key
+ preventWrite f
+ preventWrite (parentDir f)
+
u <- getUUID g
uuids <- liftIO $ keyLocations g key