summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2016-03-25 16:20:32 -0400
committerJoey Hess2016-03-25 16:20:32 -0400
commitf01776d64b1b8fcf89903d0de1ffe27f10d620ee (patch)
treecb7ef68ab23aa43e8a7ed7b428ef57f0b356921f /src/Propellor/Property
parent6b9f3158df63e18b32b7175205ef686badc3bc1b (diff)
rename toProp to toChildProperties
and note that it's not meant to be used by regular users
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Chroot.hs7
-rw-r--r--src/Propellor/Property/Docker.hs4
-rw-r--r--src/Propellor/Property/List.hs6
3 files changed, 7 insertions, 10 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index fb05d659..bf6f2083 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -213,11 +213,10 @@ chain hostlist (ChrootChain hn loc systemdonly onconsole) =
changeWorkingDirectory localdir
when onconsole forceConsole
onlyProcess (provisioningLock loc) $ do
- r <- runPropellor (setInChroot h) $ ensureProperties $
+ r <- runPropellor (setInChroot h) $ ensureChildProperties $
if systemdonly
- then [Systemd.installed]
- else map ignoreInfo $
- hostProperties h
+ then [toProp Systemd.installed]
+ else hostProperties h
flushConcurrentOutput
putStrLn $ "\n" ++ show r
chain _ _ = errorMessage "bad chain command"
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index 4bbfeef3..d19d15aa 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -581,9 +581,7 @@ chain hostlist hn s = case toContainerId s of
go cid h = do
changeWorkingDirectory localdir
onlyProcess (provisioningLock cid) $ do
- r <- runPropellor h $ ensureChildProperties $
- map ignoreInfo $
- hostProperties h
+ r <- runPropellor h $ ensureChildProperties $ hostProperties h
flushConcurrentOutput
putStrLn $ "\n" ++ show r
diff --git a/src/Propellor/Property/List.hs b/src/Propellor/Property/List.hs
index 44916f23..d8c5cff4 100644
--- a/src/Propellor/Property/List.hs
+++ b/src/Propellor/Property/List.hs
@@ -21,7 +21,7 @@ import Propellor.Exception
import Data.Monoid
toProps :: [Property (MetaTypes metatypes)] -> Props (MetaTypes metatypes)
-toProps ps = Props (map toProp ps)
+toProps ps = Props (map toChildProperty ps)
-- | Combines a list of properties, resulting in a single property
-- that when run will run each property in the list in turn,
@@ -38,7 +38,7 @@ propertyList desc (Props ps) =
property desc (ensureChildProperties cs)
`modifyChildren` (++ cs)
where
- cs = map toProp ps
+ cs = map toChildProperty ps
-- | Combines a list of properties, resulting in one property that
-- ensures each in turn. Stops if a property fails.
@@ -47,7 +47,7 @@ combineProperties desc (Props ps) =
property desc (combineSatisfy cs NoChange)
`modifyChildren` (++ cs)
where
- cs = map toProp ps
+ cs = map toChildProperty ps
combineSatisfy :: [ChildProperty] -> Result -> Propellor Result
combineSatisfy [] rs = return rs