fsck: Fix a reversion in direct mode fsck of a file that is present when the location log thinks it is not. Reversion introduced in version 5.20151208.

This commit is contained in:
Joey Hess 2016-07-12 13:41:03 -04:00
parent ff2f6ed241
commit 5642daa651
Failed to extract signature
4 changed files with 27 additions and 2 deletions

View file

@ -214,11 +214,11 @@ fixLink key file = do
- in this repository only. -}
verifyLocationLog :: Key -> KeyStatus -> String -> Annex Bool
verifyLocationLog key keystatus desc = do
direct <- isDirect
obj <- calcRepo $ gitAnnexLocation key
present <- if isKeyUnlocked keystatus
present <- if not direct && isKeyUnlocked keystatus
then liftIO (doesFileExist obj)
else inAnnex key
direct <- isDirect
u <- getUUID
{- Since we're checking that a key's object file is present, throw