summaryrefslogtreecommitdiff
path: root/src/Propellor/Property.hs
diff options
context:
space:
mode:
authorJoey Hess2015-01-04 12:44:05 -0400
committerJoey Hess2015-01-04 12:44:05 -0400
commit8172f243d73f0c7f7231d03c3561c3da5a7ad0d4 (patch)
treee260aa5e95469157d42a7cfa0a88cd11e236ad5b /src/Propellor/Property.hs
parenta1f61e09b8d72ef4d4ee8490b9b228dafd8b3d1d (diff)
DNS WIP
Diffstat (limited to 'src/Propellor/Property.hs')
-rw-r--r--src/Propellor/Property.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs
index 37fd90d6..c0878fb6 100644
--- a/src/Propellor/Property.hs
+++ b/src/Propellor/Property.hs
@@ -26,8 +26,7 @@ propertyList :: Desc -> [Property] -> Property
propertyList desc ps = Property desc (ensureProperties ps) (combineInfos ps)
-- | Combines a list of properties, resulting in one property that
--- ensures each in turn. Does not stop on failure; does propigate
--- overall success/failure.
+-- ensures each in turn. Stops if a property fails.
combineProperties :: Desc -> [Property] -> Property
combineProperties desc ps = Property desc (go ps NoChange) (combineInfos ps)
where