propellor spin

debian/changelog

@@ -1,3 +1,10 @@
+propellor (1.2.2) UNRELEASED; urgency=medium
+
+  * docker, chroot: Avoid ensureProperty warning about Info propigation,
+    which is handled properly for there.
+
+ -- Joey Hess <id@joeyh.name>  Sun, 21 Dec 2014 21:11:45 -0400
+
 propellor (1.2.1) unstable; urgency=medium
 
   * Added CryptPassword to PrivDataField, for password hashes as produced 

src/Propellor/Engine.hs

@@ -4,7 +4,9 @@ module Propellor.Engine (
 	mainProperties,
 	runPropellor,
 	ensureProperty,
+	ensureProperty',
 	ensureProperties,
+	ensurePropertiesWith,
 	fromHost,
 	onlyProcess,
 	processChainOutput,
@@ -73,6 +75,7 @@ ensureProperty p = do
 		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
 

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 $ ensureProperties $
+			r <- runPropellor h $ ensurePropertiesWith ensureProperty' $
 				if systemdonly
 					then [Systemd.installed]
 					else hostProperties h

src/Propellor/Property/Docker.hs

@@ -456,7 +456,8 @@ chain hostlist hn s = case toContainerId s of
 	go cid h = do
 		changeWorkingDirectory localdir
 		onlyProcess (provisioningLock cid) $ do
-			r <- runPropellor h $ ensureProperties $ hostProperties h
+			r <- runPropellor h $ ensurePropertiesWith ensureProperty' $
+				hostProperties h
 			putStrLn $ "\n" ++ show r
 
 stopContainer :: ContainerId -> IO Bool