diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-06-20 13:48:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-06-20 13:48:54 -0400 |
| commit | a0d9ebf0334c98be75d18fd83d860ec7370a8005 (patch) | |
| tree | b5b93bbe6b32e4c5c4af450a028a1f16f57f789b /src/Propellor/Property.hs | |
| parent | f0fbdce8fd8369eaa78dfff02aca79fb61170931 (diff) | |
| parent | 255a52c13ccb0e78744c32c7cbb169682e2b947a (diff) | |
Merge remote-tracking branch 'felix/derivedatatypeable-exception'
Diffstat (limited to 'src/Propellor/Property.hs')
| -rw-r--r-- | src/Propellor/Property.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs index f23fd3ba..7ee9397e 100644 --- a/src/Propellor/Property.hs +++ b/src/Propellor/Property.hs @@ -54,7 +54,7 @@ import System.Posix.Files import qualified Data.Hash.MD5 as MD5 import Data.List import Control.Applicative -import Data.Foldable +import Data.Foldable hiding (and, elem) import Prelude import Propellor.Types @@ -83,7 +83,7 @@ flagFile' p getflagfile = adjustPropertySatisfy p $ \satisfy -> do go _ _ True = return NoChange go satisfy flagfile False = do r <- satisfy - when (r == MadeChange) $ liftIO $ + when (r == MadeChange) $ liftIO $ unlessM (doesFileExist flagfile) $ do createDirectoryIfMissing True (takeDirectory flagfile) writeFile flagfile "" @@ -279,7 +279,7 @@ pickOS , SingI c -- Would be nice to have this constraint, but -- union will not generate metatypes lists with the same - -- order of OS's as is used everywhere else. So, + -- order of OS's as is used everywhere else. So, -- would need a type-level sort. --, Union a b ~ c ) @@ -297,7 +297,7 @@ pickOS a b = c `addChildren` [toChildProperty a, toChildProperty b] then getSatisfy b else unsupportedOS' matching Nothing _ = False - matching (Just o) p = + matching (Just o) p = Targeting (systemToTargetOS o) `elem` fromSing (proptype p) |