summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-12-21 21:33:03 -0400
committerJoey Hess2014-12-21 21:33:03 -0400
commitdc36a98fc159794395512ff2ae78eb8e0acb0ea5 (patch)
treead35d9cf8bfa1666e6ac5082ad388a7346084a2f /src/Propellor/Property
parent7f35024ef2d8256dcc17edadb6a268e94974dcf1 (diff)
Revert ensureProperty warning message, too many false positives in places where Info is correctly propigated. Better approach needed.
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Chroot.hs2
-rw-r--r--src/Propellor/Property/Docker.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index ebd38f9a..3da8b0d6 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 7a066037..02bda2e9 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