summaryrefslogtreecommitdiff
path: root/src/Propellor/Property.hs
diff options
context:
space:
mode:
authorJoey Hess2014-10-23 11:42:34 -0400
committerJoey Hess2014-10-23 11:42:34 -0400
commit26bef2486d27b2cde6feda633c6a7509675a3fe5 (patch)
treecb2aef061ae9ab0476824010abc6768b74fe0413 /src/Propellor/Property.hs
parentd3a351e3a0b9fadb1a126bc94143ee6cd410e722 (diff)
Revert "Revert "propellor spin""
This reverts commit 8d353813bf1e4d0c64f33cf2beed0938eeca92b4.
Diffstat (limited to 'src/Propellor/Property.hs')
-rw-r--r--src/Propellor/Property.hs10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs
index 4b957317..ce825192 100644
--- a/src/Propellor/Property.hs
+++ b/src/Propellor/Property.hs
@@ -135,7 +135,7 @@ host hn = Host hn [] mempty
--
-- Can add Properties and RevertableProperties
(&) :: IsProp p => Host -> p -> Host
-(Host hn ps is) & p = Host hn (ps ++ [toProp p]) (is <> getInfo p)
+(Host hn ps as) & p = Host hn (ps ++ [toProp p]) (as <> getInfo p)
infixl 1 &
@@ -145,14 +145,6 @@ h ! p = h & revert p
infixl 1 !
--- | Like (&), but adds the property as the first property of the host.
--- Normally, property order should not matter, but this is useful
--- when it does.
-(&^) :: IsProp p => Host -> p -> Host
-(Host hn ps is) &^ p = Host hn ([toProp p] ++ ps) (getInfo p <> is)
-
-infixl 1 &^
-
-- Changes the action that is performed to satisfy a property.
adjustProperty :: Property -> (Propellor Result -> Propellor Result) -> Property
adjustProperty p f = p { propertySatisfy = f (propertySatisfy p) }