summaryrefslogtreecommitdiff
path: root/Database
diff options
context:
space:
mode:
authorJoeyHess <>2019-09-13 16:54:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-09-13 16:54:00 (GMT)
commit09e89c7ef80c7e879bfe1376102101cca6baf130 (patch)
tree538b27694f3cd8ac0861907ce1d0bd3d0d5efc82 /Database
parent9383df3bee6ee096ffd27c6b43ddc11a3816ffe4 (diff)
version 7.201909127.20190912
Diffstat (limited to 'Database')
-rw-r--r--Database/Keys.hs8
1 files changed, 2 insertions, 6 deletions
diff --git a/Database/Keys.hs b/Database/Keys.hs
index 7793136..e60724c 100644
--- a/Database/Keys.hs
+++ b/Database/Keys.hs
@@ -29,7 +29,6 @@ import qualified Database.Queue as H
import Database.Init
import Annex.Locations
import Annex.Common hiding (delete)
-import Annex.Version (versionUsesKeysDatabase)
import qualified Annex
import Annex.LockFile
import Annex.CatFile
@@ -103,10 +102,7 @@ getDbHandle = go =<< Annex.getState Annex.keysdbhandle
where
go (Just h) = pure h
go Nothing = do
- h <- ifM versionUsesKeysDatabase
- ( liftIO newDbHandle
- , liftIO unavailableDbHandle
- )
+ h <- liftIO newDbHandle
Annex.changeState $ \s -> s { Annex.keysdbhandle = Just h }
return h
@@ -220,7 +216,7 @@ removeInodeCaches = runWriterIO . SQL.removeInodeCaches . toIKey
- file.
-}
reconcileStaged :: H.DbQueue -> Annex ()
-reconcileStaged qh = whenM versionUsesKeysDatabase $ do
+reconcileStaged qh = do
gitindex <- inRepo currentIndexFile
indexcache <- fromRepo gitAnnexKeysDbIndexCache
withTSDelta (liftIO . genInodeCache gitindex) >>= \case