From 14f19bdafd2dfcbece16214f168a3f8154a24581 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Sep 2017 16:22:32 -0400 Subject: refactor --- Remote/Helper/Export.hs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'Remote') diff --git a/Remote/Helper/Export.hs b/Remote/Helper/Export.hs index f5c3585c5..8fe4dc524 100644 --- a/Remote/Helper/Export.hs +++ b/Remote/Helper/Export.hs @@ -16,10 +16,7 @@ import Types.Key import Backend import Remote.Helper.Encryptable (isEncrypted) import Database.Export -import Logs.Export import Annex.Export -import Annex.LockFile -import Git.Sha import qualified Data.Map as M import Control.Concurrent.STM @@ -103,16 +100,8 @@ adjustExportable r = case M.lookup "exporttree" (config r) of -- updates the database, to notice when an export has been -- updated from another repository. let getexportlocs = \k -> do - whenM updateonce $ withExclusiveLock (gitAnnexExportLock (uuid r)) $ do - old <- liftIO $ fromMaybe emptyTree - <$> getExportTreeCurrent db - l <- getExport (uuid r) - case map exportedTreeish l of - (new:[]) | new /= old -> do - updateExportTree db old new - liftIO $ recordExportTreeCurrent db new - liftIO $ flushDbQueue db - _ -> return () + whenM updateonce $ + updateExportTreeFromLog db liftIO $ getExportTree db k return $ r -- cgit v1.2.3