From fcc9eea554bd939333fd643e35d52158679ccda5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 30 Oct 2018 22:19:05 -0400 Subject: [PATCH] avoid closeDb opening the db if it's not already open --- Database/Keys.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Database/Keys.hs b/Database/Keys.hs index 0456ce7666..2183ecd245 100644 --- 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