diff options
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Fsck.hs | 7 | ||||
| -rw-r--r-- | Command/Unannex.hs | 6 | ||||
| -rw-r--r-- | Command/Unlock.hs | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs index dac3bfac9..c60101fc7 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -166,10 +166,9 @@ verifyLocationLog key desc = do -- Since we're checking that a key's file is present, throw -- in a permission fixup here too. when present $ do - f <- inRepo $ gitAnnexLocation key - liftIO $ do - preventWrite f - preventWrite (parentDir f) + file <- inRepo $ gitAnnexLocation key + freezeContent file + freezeContentDir file u <- getUUID verifyLocationLog' key desc present u (logChange key u) diff --git a/Command/Unannex.hs b/Command/Unannex.hs index 1e7313711..bf931adfd 100644 --- a/Command/Unannex.hs +++ b/Command/Unannex.hs @@ -10,7 +10,6 @@ module Command.Unannex where import Common.Annex import Command import qualified Annex -import Utility.FileMode import Logs.Location import Annex.Content import qualified Git.Command @@ -51,9 +50,8 @@ cleanup file key = do ( do -- fast mode: hard link to content in annex src <- inRepo $ gitAnnexLocation key - liftIO $ do - createLink src file - allowWrite file + liftIO $ createLink src file + thawContent file , do fromAnnex key file logStatus key InfoMissing diff --git a/Command/Unlock.hs b/Command/Unlock.hs index aeb270516..3ac50a0eb 100644 --- a/Command/Unlock.hs +++ b/Command/Unlock.hs @@ -46,6 +46,6 @@ perform dest key = do liftIO $ do removeFile dest moveFile tmpdest dest - allowWrite dest + thawContent dest next $ return True else error "copy failed!" |