summaryrefslogtreecommitdiff
path: root/Assistant/XMPP
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-21 21:40:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-21 21:40:37 -0400
commitbc386221adc3929567b2a18b396f8d5442841960 (patch)
treeaaa581380aff1f3d236f997c82cde1635ddb5c74 /Assistant/XMPP
parente93cbb52e8d14dc88ef758654e0122d8b35b1e5f (diff)
perhaps this fixes the stall tbd
Diffstat (limited to 'Assistant/XMPP')
-rw-r--r--Assistant/XMPP/Git.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Assistant/XMPP/Git.hs b/Assistant/XMPP/Git.hs
index c314042e6..1e8ccca62 100644
--- a/Assistant/XMPP/Git.hs
+++ b/Assistant/XMPP/Git.hs
@@ -137,7 +137,7 @@ xmppPush cid gitpush = runPush SendPack cid $ do
liftIO $ do
mapM_ killThread [t1, t2]
mapM_ hClose [inh, outh, controlh]
-
+
return r
where
toxmpp seqnum inh = do
@@ -167,6 +167,7 @@ xmppPush cid gitpush = runPush SendPack cid $ do
liftIO $ do
hPrint controlh (ExitFailure 1)
hFlush controlh
+ killThread =<< myThreadId
installwrapper tmpdir = liftIO $ do
createDirectoryIfMissing True tmpdir