From dc36a98fc159794395512ff2ae78eb8e0acb0ea5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 21 Dec 2014 21:33:03 -0400
Subject: [PATCH] Revert ensureProperty warning message, too many false
 positives in places where Info is correctly propigated. Better approach
 needed.

---
 debian/changelog                 |  4 ++--
 src/Propellor/Engine.hs          | 25 ++++---------------------
 src/Propellor/Property/Chroot.hs |  2 +-
 src/Propellor/Property/Docker.hs |  2 +-
 4 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e7b0cd..3524cb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 propellor (1.2.2) UNRELEASED; urgency=medium
 
-  * docker, chroot: Avoid ensureProperty warning about Info propigation,
-    which is handled properly for there.
+  * Revert ensureProperty warning message, too many false positives in places
+    where Info is correctly propigated. Better approach needed.
 
  -- Joey Hess <id@joeyh.name>  Sun, 21 Dec 2014 21:11:45 -0400
 
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs
index c00597b..f29ce1a 100644
--- a/src/Propellor/Engine.hs
+++ b/src/Propellor/Engine.hs
@@ -4,9 +4,7 @@ module Propellor.Engine (
 	mainProperties,
 	runPropellor,
 	ensureProperty,
-	ensureProperty',
 	ensureProperties,
-	ensurePropertiesWith,
 	fromHost,
 	onlyProcess,
 	processChainOutput,
@@ -25,7 +23,6 @@ import System.FilePath
 import System.Directory
 
 import Propellor.Types
-import Propellor.Types.Empty
 import Propellor.Message
 import Propellor.Exception
 import Propellor.Info
@@ -38,7 +35,7 @@ import Utility.Monad
 mainProperties :: Host -> IO ()
 mainProperties host = do
 	ret <- runPropellor host $
-		ensureProperties [Property "overall" (ensurePropertiesWith ensureProperty' $ hostProperties host) mempty]
+		ensureProperties [Property "overall" (ensureProperties $ hostProperties host) mempty]
 	h <- mkMessageHandle
         whenConsole h $
 		setTitle "propellor: done"
@@ -65,31 +62,17 @@ runEndAction host res (EndAction desc a) = actionMessageOn (hostName host) desc
 
 -- | For when code running in the Propellor monad needs to ensure a
 -- Property.
---
--- Note that any info of the Property is not propigated out to
--- the enclosing Property, and so will not be available for propellor to
--- use. A warning message will be printed if this is detected.
 ensureProperty :: Property -> Propellor Result
-ensureProperty p = do
-	unless (isEmpty (getInfo p)) $
-		warningMessage $ "ensureProperty called on " ++ show p ++ "; will not propigate its info: " ++ show (getInfo p)
-	ensureProperty' p
-
--- | ensureProperty without the warning message.
-ensureProperty' :: Property -> Propellor Result
-ensureProperty' = catchPropellor . propertySatisfy
+ensureProperty = catchPropellor . propertySatisfy
 
 -- | Ensures a list of Properties, with a display of each as it runs.
 ensureProperties :: [Property] -> Propellor Result
-ensureProperties = ensurePropertiesWith ensureProperty
-
-ensurePropertiesWith :: (Property -> Propellor Result) -> [Property] -> Propellor Result
-ensurePropertiesWith a ps = ensure ps NoChange
+ensureProperties ps = ensure ps NoChange
   where
 	ensure [] rs = return rs
 	ensure (p:ls) rs = do
 		hn <- asks hostName
-		r <- actionMessageOn hn (propertyDesc p) (a p)
+		r <- actionMessageOn hn (propertyDesc p) (ensureProperty p)
 		ensure ls (r <> rs)
 
 -- | Lifts an action into a different host.
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index ebd38f9..3da8b0d 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -137,7 +137,7 @@ chain hostlist (ChrootChain hn loc systemdonly onconsole) =
 		changeWorkingDirectory localdir
 		when onconsole forceConsole
 		onlyProcess (provisioningLock loc) $ do
-			r <- runPropellor h $ ensurePropertiesWith ensureProperty' $
+			r <- runPropellor h $ ensureProperties $
 				if systemdonly
 					then [Systemd.installed]
 					else hostProperties h
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index 7a06603..02bda2e 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -456,7 +456,7 @@ chain hostlist hn s = case toContainerId s of
 	go cid h = do
 		changeWorkingDirectory localdir
 		onlyProcess (provisioningLock cid) $ do
-			r <- runPropellor h $ ensurePropertiesWith ensureProperty' $
+			r <- runPropellor h $ ensureProperties $
 				hostProperties h
 			putStrLn $ "\n" ++ show r