mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix todo

Browse source
This commit is contained in:
Joey Hess 2019-03-04 18:20:12 -04:00
parent bc509143e5
commit 554b7b7f3e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Remote/Helper/ExportImport.hs
View file

@ -23,6 +23,7 @@ import Annex.LockFile
import Config
import Git.Types (fromRef)
import Logs.Export
import Logs.ContentIdentifier (recordContentIdentifier)
import qualified Data.Map as M
import Control.Concurrent.STM
@ -132,9 +133,9 @@ adjustExportImport r = case M.lookup "exporttree" (config r) of
lcklckv <- liftIO newEmptyTMVarIO
dbtv <- liftIO newEmptyTMVarIO
let store f k loc p = do
-- Only open the database once it's needed, since
-- we have to take an exclusive write lock.
-- The write lock will remain held while the
-- Only open the database once it's needed,
-- and take an exclusive write lock.
-- The write lock will then remain held while the
-- process is running.
db <- liftIO (atomically (tryReadTMVar dbtv)) >>= \case
Just (db, _lck) -> return db
@ -159,7 +160,7 @@ adjustExportImport r = case M.lookup "exporttree" (config r) of
Nothing -> return False
Just newcid -> do
liftIO $ ContentIdentifier.recordContentIdentifier db (uuid r') newcid k
-- TODO update git-annex branch
recordContentIdentifier (uuid r') newcid k
return True
return $ r'