cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix combines instance 

The old one caused the actions to run in the right order, but with the
wrong description.

This problem was found by comparing the [Host] between this branch and
current joeyconfig, and printing out their properties, info, and also their
list of child properties.

The only other difference found is that onChange orders the child property
list differently. That does not have any real effect and would be difficult
to change, so I've left it as-is.
This commit is contained in:
Joey Hess 2015-01-25 13:28:04 -04:00
parent f4fc24aa5c
commit 334abae312
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Propellor/Types.hs
View File

@ -250,7 +250,8 @@ instance Combines (Property HasInfo) (Property NoInfo) where
IProperty d1 (a2 <> a1) i1 (toIProperty y : cs1) IProperty d1 (a2 <> a1) i1 (toIProperty y : cs1)
instance Combines (Property NoInfo) (Property HasInfo) where instance Combines (Property NoInfo) (Property HasInfo) where
requires x y = requires y x requires (SProperty d1 a1 cs1) y@(IProperty _d2 a2 _i2 _cs2) =
IProperty d1 (a2 <> a1) mempty (y : map toIProperty cs1)
instance Combines (Property NoInfo) (Property NoInfo) where instance Combines (Property NoInfo) (Property NoInfo) where
requires (SProperty d1 a1 cs1) y@(SProperty _d2 a2 _cs2) = requires (SProperty d1 a1 cs1) y@(SProperty _d2 a2 _cs2) =