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

fix oops

Browse source
This commit is contained in:
Joey Hess 2019-06-19 14:52:44 -04:00
parent 9d36c826c0
commit 05a908c3c9
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Annex/Concurrent.hs
View file

@ -94,10 +94,9 @@ enteringStage :: WorkerStage -> Annex a -> Annex a
enteringStage newstage a = do enteringStage newstage a = do
mytid <- liftIO myThreadId mytid <- liftIO myThreadId
tv <- Annex.getState Annex.workers tv <- Annex.getState Annex.workers
let setup = changeStageTo mytid tv newstage let set = changeStageTo mytid tv newstage
let cleanup Nothing = noop let restore = maybe noop (void . changeStageTo mytid tv)
let cleanup (Just oldstage) = changeStageTo mytid tv oldstage bracket set restore (const a)
bracket setup cleanup (const a)
changeStageTo :: ThreadId -> TMVar (WorkerPool AnnexState) -> WorkerStage -> Annex (Maybe WorkerStage) changeStageTo :: ThreadId -> TMVar (WorkerPool AnnexState) -> WorkerStage -> Annex (Maybe WorkerStage)
changeStageTo mytid tv newstage = liftIO $ atomically $ do changeStageTo mytid tv newstage = liftIO $ atomically $ do