summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-06 14:41:48 -0400
committerJoey Hess2016-03-06 14:41:48 -0400
commitaf34093977b209c4fb7059677bd537ffd86b516d (patch)
tree215a487bdfa9f2b8fc66647c6922d9b027b97a07
parent5d785e487dd792ad82d2f089334eecd23430e589 (diff)
move back
-rw-r--r--src/Propellor/CmdLine.hs2
-rw-r--r--src/Propellor/Engine.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 18101885..a0ae9cb5 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -92,7 +92,7 @@ data CanRebuild = CanRebuild | NoRebuild
-- | Runs propellor on hosts, as controlled by command-line options.
defaultMain :: [Host] -> IO ()
-defaultMain hostlist = do
+defaultMain hostlist = withConcurrentOutput $ do
Shim.cleanEnv
checkDebugMode
cmdline <- processCmdLine
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs
index 30026568..2e914d67 100644
--- a/src/Propellor/Engine.hs
+++ b/src/Propellor/Engine.hs
@@ -32,7 +32,7 @@ import Utility.Exception
-- | Gets the Properties of a Host, and ensures them all,
-- with nice display of what's being done.
mainProperties :: Host -> IO ()
-mainProperties host = withConcurrentOutput $ do
+mainProperties host = do
ret <- runPropellor host $
ensureProperties [ignoreInfo $ infoProperty "overall" (ensureProperties ps) mempty mempty]
messagesDone