diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-20 13:06:05 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-20 13:06:05 -0400 |
| commit | 827b5a8fbc2a39ac9ebfa8571dab096071a1471d (patch) | |
| tree | da7fdecfb8b4d1fc689df573a6027cdbd3fdd06c /src | |
| parent | 4be7bb8c9f9120654a95788ff9b6a34226dea06a (diff) | |
rename
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Types/Target.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Types/Target.hs b/src/Propellor/Types/Target.hs index 2b4699c0..420c6ed2 100644 --- a/src/Propellor/Types/Target.hs +++ b/src/Propellor/Types/Target.hs @@ -15,7 +15,7 @@ module Propellor.Types.Target ( OuterPropTypes, ensureProperty, tightenTargets, - orProperty, + pickOS, Sing, WithTypes, ) where @@ -27,7 +27,7 @@ foo = mkProperty' $ \t -> do ensureProperty t jail bar :: Property (Debian :+: FreeBSD) -bar = aptinstall `orProperty` jail +bar = aptinstall `pickOS` jail aptinstall :: Property Debian aptinstall = mkProperty $ do @@ -163,7 +163,7 @@ tightenTargets _ (Property old a) = Property sing a -- -- If both input properties support the targeted OS, then the -- first will be used. -orProperty +pickOS :: ( combined ~ Union a b , Sing combined @@ -171,7 +171,7 @@ orProperty => Property (WithTypes a) -> Property (WithTypes b) -> Property (WithTypes combined) -orProperty a@(Property ta ioa) b@(Property tb iob) = Property sing io +pickOS a@(Property ta ioa) b@(Property tb iob) = Property sing io where -- TODO pick with of ioa or iob to use based on final OS of -- system being run on. |