summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-12-21 21:14:11 -0400
committerJoey Hess2014-12-21 21:14:11 -0400
commitd194765e10eae7769210f1b1a19c08835d555fed (patch)
treee9bfae34d38a5376b40f4297ad90855c84ed2e00
parent9444326c877d6cf6b25f6750ed9212dbc7c200cd (diff)
propellor spin
-rw-r--r--debian/changelog7
-rw-r--r--src/Propellor/Engine.hs3
-rw-r--r--src/Propellor/Property/Chroot.hs2
-rw-r--r--src/Propellor/Property/Docker.hs3
4 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index af964774..9e7b0cd7 100644
--- a/debian/changelog
+++ b/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
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs
index dc8b2bc5..c00597be 100644
--- a/src/Propellor/Engine.hs
+++ b/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
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index 3da8b0d6..ebd38f9a 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 $ ensureProperties $
+ r <- runPropellor h $ ensurePropertiesWith ensureProperty' $
if systemdonly
then [Systemd.installed]
else hostProperties h
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index b48afbbb..7a066037 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/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