From 827b5a8fbc2a39ac9ebfa8571dab096071a1471d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 20 Mar 2016 13:06:05 -0400 Subject: rename --- src/Propellor/Types/Target.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Propellor') 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. -- cgit v1.2.3