avoid closeDb opening the db if it's not already open

2018-10-30 22:19:05 -04:00 · 2018-10-30 22:19:05 -04:00 · fcc9eea554
commit fcc9eea554
parent b144622d0d
1 changed files with 3 additions and 1 deletions
--- a/Database/Keys.hs
+++ b/Database/Keys.hs
@ -151,7 +151,9 @@ openDb createdb _ = catchPermissionDenied permerr $ withExclusiveLock gitAnnexKe
 - data to it.
 -}
 closeDb :: Annex ()
-closeDb = liftIO . closeDbHandle =<< getDbHandle
+closeDb = Annex.getState Annex.keysdbhandle >>= \case
+	Nothing -> return ()
+	Just h -> liftIO (closeDbHandle h)

 addAssociatedFile :: Key -> TopFilePath -> Annex ()
 addAssociatedFile k f = runWriterIO $ SQL.addAssociatedFile (toIKey k) f