From dc36a98fc159794395512ff2ae78eb8e0acb0ea5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 21 Dec 2014 21:33:03 -0400 Subject: Revert ensureProperty warning message, too many false positives in places where Info is correctly propigated. Better approach needed. --- src/Propellor/Property/Chroot.hs | 2 +- src/Propellor/Property/Docker.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property') 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 -- cgit v1.2.3