diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-02-04 11:59:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-04 11:59:02 -0400 |
| commit | dcae58d6262117122dc8af0a0e6fc63ed2c25c88 (patch) | |
| tree | c394be44bd65b8e4b7be4d8c90e3608400e148fc /src/Propellor | |
| parent | c0a2701284a800f55abdd61f0b8619582c399a9e (diff) | |
| parent | ab7a7f421c9b57b5963a44e57a6a4df7c594aca6 (diff) | |
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor')
| -rw-r--r-- | src/Propellor/Property.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs index 884ee683..8c0a5859 100644 --- a/src/Propellor/Property.hs +++ b/src/Propellor/Property.hs @@ -55,6 +55,7 @@ import Data.Maybe import Data.List import Data.Hashable import Control.Applicative +import GHC.Stack import Prelude import Propellor.Types @@ -283,6 +284,7 @@ isNewerThan x y = do -- fail that way. pickOS :: + HasCallStack => ( SingKind ('KProxy :: KProxy ka) , SingKind ('KProxy :: KProxy kb) , DemoteRep ('KProxy :: KProxy ka) ~ [MetaType] @@ -344,7 +346,7 @@ unsupportedOS = property "unsupportedOS" unsupportedOS' -- | Throws an error, for use in `withOS` when a property is lacking -- support for an OS. -unsupportedOS' :: Propellor Result +unsupportedOS' :: HasCallStack => Propellor Result unsupportedOS' = go =<< getOS where go Nothing = error "Unknown host OS is not supported by this property." |