summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-02-20 13:53:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-02-20 13:53:49 -0400
commit030495c8f6a4bf43b6b7f3de53d088a1c60e99a6 (patch)
tree42dc5fc509f47339f2618b2eeb4e672360ebc09b /Annex
parent4329a0902d7985e7c3391d20d07504c06071e516 (diff)
unused: Fix to actually detect unused keys when in direct mode.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Content.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index 464b98f05..bffef19f4 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -491,9 +491,11 @@ getKeysPresent = do
{- In indirect mode, look for the key. In direct mode,
- the inode cache file is only present when a key's content
- - is present. -}
+ - is present, so can be used as a surrogate if the content
+ - is not located in the annex directory. -}
present False d = doesFileExist $ contentfile d
- present True d = doesFileExist $ contentfile d ++ ".cache"
+ present True d = doesFileExist (contentfile d ++ ".cache")
+ <||> present False d
contentfile d = d </> takeFileName d
{- Things to do to record changes to content when shutting down.