summaryrefslogtreecommitdiff
path: root/src/Propellor/PropAccum.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-25 14:04:40 -0400
committerJoey Hess2016-03-25 14:04:40 -0400
commit91d1833155a2e8be2c435d0a92a750cc9d2f30b5 (patch)
treebd9662a258b4b0544e19295a319b61086a201d6f /src/Propellor/PropAccum.hs
parent48a05503493caeb80794a872b0e3b4482d5859ce (diff)
ported Property.List
I wanted to keep propertyList [foo, bar] working, but had some difficulty making the type class approach work. Anyway, that's unlikely to be useful, since foo and bar probably have different types, or could easiy have their types updated breaking it.
Diffstat (limited to 'src/Propellor/PropAccum.hs')
-rw-r--r--src/Propellor/PropAccum.hs9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Propellor/PropAccum.hs b/src/Propellor/PropAccum.hs
index fb38e260..8177b97b 100644
--- a/src/Propellor/PropAccum.hs
+++ b/src/Propellor/PropAccum.hs
@@ -36,8 +36,9 @@ host hn (Props i c) = Host hn c i
-- metatypes and info.
data Props metatypes = Props Info [ChildProperty]
--- | Start constructing a Props. Properties can then be added to it using
--- `(&)` etc.
+-- | Start accumulating a list of properties.
+--
+-- Properties can be added to it using `(&)` etc.
props :: Props UnixLike
props = Props mempty []
@@ -102,7 +103,7 @@ propagateContainer
propagateContainer containername c prop = Property
undefined
(propertyDesc prop)
- (propertySatisfy prop)
+ (getSatisfy prop)
(propertyInfo prop)
(propertyChildren prop ++ hostprops)
where
@@ -111,6 +112,6 @@ propagateContainer containername c prop = Property
let i = mapInfo (forceHostContext containername)
(propagatableInfo (propertyInfo p))
cs = map go (propertyChildren p)
- in infoProperty (propertyDesc p) (propertySatisfy p) i cs
+ in infoProperty (propertyDesc p) (getSatisfy p) i cs
-}