diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-07-12 13:41:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-07-12 13:41:03 -0400 |
| commit | 6eaf1e333399625f48f03fb504811a397ab9e0cc (patch) | |
| tree | 57e057d1d4e68f6d487da6cc911e098b83462551 /Command | |
| parent | 51774936cd87be4f95aa7c3256066654f1e23e90 (diff) | |
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.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Fsck.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 28ce7752d..6bc91f0ef 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -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 |