summaryrefslogtreecommitdiff
path: root/src/Propellor/Engine.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-16 14:23:14 -0400
committerJoey Hess2015-10-16 14:23:14 -0400
commit4b848fedbf2d3a7b7ba94abd2b0ed8526df2fac7 (patch)
tree8e8d067bebb2e82e0e8354ff871791f2e1c7114f /src/Propellor/Engine.hs
parent51634a1bfc091b0c2e005e58266771dab0710ffe (diff)
parente66b62f40bcb29ca62c905dabe87cc6e91a6bccd (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Engine.hs')
-rw-r--r--src/Propellor/Engine.hs11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs
index 0fdbb995..87fa4cd2 100644
--- a/src/Propellor/Engine.hs
+++ b/src/Propellor/Engine.hs
@@ -26,6 +26,8 @@ import Propellor.Types
import Propellor.Message
import Propellor.Exception
import Propellor.Info
+import Propellor.Types.Info
+import Propellor.Types.CmdLine
import Propellor.Property
import Utility.Exception
import Utility.PartialPrelude
@@ -33,9 +35,9 @@ import Utility.Monad
-- | Gets the Properties of a Host, and ensures them all,
-- with nice display of what's being done.
-mainProperties :: Host -> IO ()
-mainProperties host = do
- ret <- runPropellor host $
+mainProperties :: ControllerChain -> Host -> IO ()
+mainProperties cc host = do
+ ret <- runPropellor host' $
ensureProperties [ignoreInfo $ infoProperty "overall" (ensureProperties ps) mempty mempty]
h <- mkMessageHandle
whenConsole h $
@@ -45,7 +47,8 @@ mainProperties host = do
FailedChange -> exitWith (ExitFailure 1)
_ -> exitWith ExitSuccess
where
- ps = map ignoreInfo $ hostProperties host
+ ps = map ignoreInfo $ hostProperties host'
+ host' = addHostInfo host (InfoVal cc)
-- | Runs a Propellor action with the specified host.
--