summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-04-11 00:35:48 -0400
committerJoey Hess2014-04-11 00:35:48 -0400
commit29ae27af3c59a221fa60995f435ca2e4a5c6d76e (patch)
treed25033ea127e8e8f16ecf7fa4454c92e60df527a /Propellor
parent4c4f702cff18ad51dd3e9c3af4604d896aa1d7ce (diff)
fix attr combination
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/Property.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/Propellor/Property.hs b/Propellor/Property.hs
index e334bfb8..3a3c1cb1 100644
--- a/Propellor/Property.hs
+++ b/Propellor/Property.hs
@@ -10,7 +10,6 @@ import "mtl" Control.Monad.Reader
import Propellor.Types
import Propellor.Types.Attr
-import Propellor.Attr
import Propellor.Engine
import Utility.Monad
@@ -108,13 +107,13 @@ host hn = Host [] (\_ -> newAttr hn)
-- | Adds a property to a Host
-- Can add Properties, RevertableProperties, and AttrProperties
(&) :: IsProp p => Host -> p -> Host
-(Host ps as) & p = Host (ps ++ [toProp p]) (as . getAttr p)
+(Host ps as) & p = Host (ps ++ [toProp p]) (getAttr p . as)
infixl 1 &
-- | Adds a property to the Host in reverted form.
(!) :: Host -> RevertableProperty -> Host
-(Host ps as) ! p = Host (ps ++ [toProp q]) (as . getAttr q)
+(Host ps as) ! p = Host (ps ++ [toProp q]) (getAttr q . as)
where
q = revert p