From af34093977b209c4fb7059677bd537ffd86b516d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Mar 2016 14:41:48 -0400 Subject: move back --- src/Propellor/CmdLine.hs | 2 +- src/Propellor/Engine.hs | 2 +- 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 -- cgit v1.2.3