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

fix hang if external program is not available

Browse source 
startExternal' throws an exception, which left the externalAsync TMVar
empty, so the next try to use it would hang.
This commit is contained in:
Joey Hess 2020-08-19 12:20:07 -04:00
parent 168bf5e0c5
commit d00ce82418
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Remote/External.hs
View file

@ -616,6 +616,7 @@ startExternal external =
liftIO (atomically $ takeTMVar (externalAsync external)) >>= \case liftIO (atomically $ takeTMVar (externalAsync external)) >>= \case
UncheckedExternalAsync -> do UncheckedExternalAsync -> do
(st, extensions) <- startExternal' external (st, extensions) <- startExternal' external
`onException` store UncheckedExternalAsync
if asyncExtensionEnabled extensions if asyncExtensionEnabled extensions
then do then do
relay <- liftIO $ runRelayToExternalAsync external st relay <- liftIO $ runRelayToExternalAsync external st

2
doc/bugs/testremote_with_external_remote_hangs_after_asyncexternal_merge.mdwn
View file

@ -56,3 +56,5 @@ With the first commit before the merge checked out (0900bb2ca), the
[[!meta author=kyle]] [[!meta author=kyle]]
[[!tag projects/datalad]] [[!tag projects/datalad]]
> [[fixed|done]] thanks for reporting --[[Joey]]