summaryrefslogtreecommitdiff
path: root/src/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2015-11-01 12:15:16 -0400
committerJoey Hess2015-11-01 12:15:16 -0400
commitada8035a2a1d4d6cf7463266272a51bc2768fb63 (patch)
tree3c99827495348dc0c50972fed34c4c9dec5fdaed /src/Propellor/CmdLine.hs
parent0afa0c0593b655af475ecc9db1e3add7d2c18299 (diff)
a few tweaks for concurrent output
Force console mode when --spin calls SimpleRun
Diffstat (limited to 'src/Propellor/CmdLine.hs')
-rw-r--r--src/Propellor/CmdLine.hs5
1 files changed, 3 insertions, 2 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)