language-puppet 1.1.3 → 1.1.3.1

raw patch · 2 files changed

+6/−8 lines, 2 filesdep ~aesondep ~either

Dependency ranges changed: aeson, either

Files

• language-puppet.cabal +3/−3
• tests/puppetdb.hs +3/−5

@@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/  name:                language-puppet-version:             1.1.3+version:             1.1.3.1 synopsis:            Tools to parse and evaluate the Puppet DSL. description:         This is a set of tools that is supposed to fill all your Puppet needs : syntax checks, catalog compilation, PuppetDB queries, simulationg of complex interactions between nodes, Puppet master replacement, and more ! homepage:            http://lpuppet.banquise.net/@@ -78,7 +78,7 @@   ghc-options:         -Wall -funbox-strict-fields   ghc-prof-options:    -auto-all -caf-all   build-depends:       base >=4.6 && < 4.9-                        , aeson                >= 0.8     && < 0.9+                        , aeson                >= 0.8     && < 0.10                         , ansi-wl-pprint       == 0.6.*                         , attoparsec           >= 0.13    && < 0.14                         , base16-bytestring    == 0.1.*@@ -87,7 +87,7 @@                         , containers           == 0.5.*                         , cryptohash           >= 0.10    && < 0.12                         , directory            == 1.2.*-                        , either               == 4.3.*+                        , either               >= 4.3     && < 4.5                         , exceptions           >= 0.8     && < 0.9                         , filecache            >= 0.2.8   && < 0.3                         , hashable             == 1.2.*

@@ -3,7 +3,6 @@ import Control.Monad import System.IO.Temp import Data.Monoid-import qualified Data.Either.Strict as S import qualified Data.Text as T import qualified Data.Text.IO as T import Control.Lens@@ -14,9 +13,9 @@ import PuppetDB.TestDB import Facter -checkError :: Show x => String -> S.Either x a -> IO a-checkError _ (S.Right x) = return x-checkError step (S.Left rr) = error (step ++ ": " ++ show rr)+checkError :: Show x => String -> Either x a -> IO a+checkError _ (Right x) = return x+checkError step (Left rr) = error (step ++ ": " ++ show rr)  checkErrorE :: Show x => String -> EitherT x IO a -> IO a checkErrorE msg = runEitherT >=> either (error . ((msg ++ " ") ++) . show) return@@ -46,4 +45,3 @@     -- and check for our facts again     fdblines <- T.lines `fmap` T.readFile pdbfile     unless ("    customfact: MyCustomFactValue" `elem` fdblines) (error "could not find my fact")-