diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 5 | ||||
| -rw-r--r-- | src/Utility/ConcurrentOutput.hs | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 4bca3986..4a4f71fe 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -120,8 +120,9 @@ defaultMain hostlist = withConcurrentOutput $ do go False (Spin hs mrelay) = do commitSpin forM_ hs $ \hn -> withhost hn $ spin mrelay hn - go False cmdline@(SimpleRun hn) = buildFirst cmdline $ - go False (Run hn) + go False cmdline@(SimpleRun hn) = do + forceConsole + buildFirst cmdline $ go False (Run hn) go False (Run hn) = ifM ((==) 0 <$> getRealUserID) ( onlyprocess $ withhost hn mainProperties , go True (Spin [hn] Nothing) diff --git a/src/Utility/ConcurrentOutput.hs b/src/Utility/ConcurrentOutput.hs index 3494aa63..4676c2fa 100644 --- a/src/Utility/ConcurrentOutput.hs +++ b/src/Utility/ConcurrentOutput.hs @@ -228,8 +228,6 @@ createProcessConcurrent p | otherwise = ss firstprocess = do - hPutStrLn stderr "RUNNING FG" - hFlush stderr r@(_, _, _, h) <- P.createProcess p `onException` dropOutputLock -- Wait for the process to exit and drop the lock. @@ -239,8 +237,6 @@ createProcessConcurrent p return r concurrentprocess = do - hPutStrLn stderr "RUNNING BG" - hFlush stderr (toouth, fromouth) <- pipe (toerrh, fromerrh) <- pipe let p' = p |