summaryrefslogtreecommitdiff
path: root/src/Propellor/Engine.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-17 13:57:51 -0400
committerJoey Hess2015-10-17 13:58:31 -0400
commit4e038a43cc9978af1015c53ab7cf27355d989069 (patch)
tree36621411192ca62bbb552de5277e1ca3c4c35670 /src/Propellor/Engine.hs
parenta487fd07dc72ba506b3d185c4d9317e5a443faa3 (diff)
use Info to detect controller loops
Much less invasive than the other implementation.
Diffstat (limited to 'src/Propellor/Engine.hs')
-rw-r--r--src/Propellor/Engine.hs11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs
index 021ddd2c..8c1d09c6 100644
--- a/src/Propellor/Engine.hs
+++ b/src/Propellor/Engine.hs
@@ -27,8 +27,6 @@ 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
@@ -36,9 +34,9 @@ import Utility.Monad
-- | Gets the Properties of a Host, and ensures them all,
-- with nice display of what's being done.
-mainProperties :: ControllerChain -> Host -> IO ()
-mainProperties cc host = do
- ret <- runPropellor host' $
+mainProperties :: Host -> IO ()
+mainProperties host = do
+ ret <- runPropellor host $
ensureProperties [ignoreInfo $ infoProperty "overall" (ensureProperties ps) mempty mempty]
h <- mkMessageHandle
whenConsole h $
@@ -48,8 +46,7 @@ mainProperties cc host = do
FailedChange -> exitWith (ExitFailure 1)
_ -> exitWith ExitSuccess
where
- ps = map ignoreInfo $ hostProperties host'
- host' = addHostInfo host (InfoVal cc)
+ ps = map ignoreInfo $ hostProperties host
-- | Runs a Propellor action with the specified host.
--