summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-10-28 14:38:52 -0400
committerJoey Hess2015-10-28 14:38:52 -0400
commit480d4eb4993b82e15ecbbfcc4aa6f600166197d2 (patch)
tree8f5b41ff24a29e40c607700ab9e20353d23c3912
parente2644e698a5a4a31896a3833708742cfd5eaa31f (diff)
propellor spin
-rw-r--r--src/Utility/ConcurrentOutput.hs11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/Utility/ConcurrentOutput.hs b/src/Utility/ConcurrentOutput.hs
index 4d74e090..40e0125e 100644
--- a/src/Utility/ConcurrentOutput.hs
+++ b/src/Utility/ConcurrentOutput.hs
@@ -85,11 +85,7 @@ takeOutputLock' block = go =<< withLock tryTakeTMVar
( havelock
, if block
then do
- hPutStr stderr "WAITFORPROCESS in lock"
- hFlush stderr
void $ P.waitForProcess h
- hPutStr stderr "WAITFORPROCESS in lock done"
- hFlush stderr
havelock
else do
withLock (`putTMVar` orig)
@@ -137,12 +133,7 @@ withConcurrentOutput a = a `finally` drain
where
-- Just taking the output lock is enough to ensure that anything
-- that was buffering output has had a chance to flush its buffer.
- drain = do
- hPutStrLn stderr "DRAIN"
- hFlush stderr
- lockOutput (return ())
- hPutStrLn stderr "DRAIN DONE"
- hFlush stderr
+ drain = lockOutput (return ())
-- | Displays a string to stdout, and flush output so it's displayed.
--