diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-03-15 14:09:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-03-15 14:09:07 -0400 |
| commit | 52ca81661f156122a3a5d4a438fea83e067215ac (patch) | |
| tree | 2156d53d78dceb7e342b3dd365d7ab33e1ebd5d0 /src/Propellor/Engine.hs | |
| parent | 51e281911d683f833d4d71ad62f2b64a5f4a0cea (diff) | |
Property types changed to use a Maybe (Propellor Result). (API change)
* Property types changed to use a Maybe (Propellor Result). (API change)
* When Nothing needs to be done to ensure a property, propellor
will avoid displaying its description at all. The doNothing property
is an example of such a property.
This is mostly in preparation for Monoid instances for Property types, but
is's also nice that anything that uses doNothing will avoid printing out
any message at all. At least, I think it probably is. It might potentially
be confusing for something that sometimes takes an action and sometimes
resolves to doNothing and in either case has a description set to not
always show the description. If this did turn out to be confusing, the
change to doNothing could be reverted.
This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
Diffstat (limited to 'src/Propellor/Engine.hs')
| -rw-r--r-- | src/Propellor/Engine.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs index 8958da6b..08f535e0 100644 --- a/src/Propellor/Engine.hs +++ b/src/Propellor/Engine.hs @@ -66,7 +66,9 @@ ensureChildProperties ps = ensure ps NoChange ensure [] rs = return rs ensure (p:ls) rs = do hn <- asks hostName - r <- actionMessageOn hn (getDesc p) (catchPropellor $ getSatisfy p) + r <- maybe (pure NoChange) + (actionMessageOn hn (getDesc p) . catchPropellor) + (getSatisfy p) ensure ls (r <> rs) -- | Lifts an action into the context of a different host. |