Actually print the Distribution.Simple.Configure error message on failure rather than throwing it on the floor.
Signed-off-by: Brian Foley <[email protected]> --- cabal/CabalDependenciesMacros.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cabal/CabalDependenciesMacros.hs b/cabal/CabalDependenciesMacros.hs index e07def7..0b6a098 100644 --- a/cabal/CabalDependenciesMacros.hs +++ b/cabal/CabalDependenciesMacros.hs @@ -3,7 +3,7 @@ module Main where import Control.Applicative import qualified Data.Set as Set import qualified Distribution.Simple.Build.Macros as Macros -import Distribution.Simple.Configure (maybeGetPersistBuildConfig) +import Distribution.Simple.Configure (tryGetPersistBuildConfig) import Distribution.Simple.LocalBuildInfo (externalPackageDeps) import Distribution.PackageDescription (packageDescription) import Distribution.PackageDescription.Parse (readPackageDescription) @@ -25,10 +25,10 @@ main = do pkgDesc <- packageDescription <$> readPackageDescription normal cabalPath -- Read the setup-config. - m'conf <- maybeGetPersistBuildConfig "dist" + m'conf <- tryGetPersistBuildConfig "dist" case m'conf of - Nothing -> error "could not read dist/setup-config" - Just conf -> do + Left (err,_) -> error $ show err + Right conf -> do -- Write package dependencies. let deps = map (display . fst) $ externalPackageDeps conf -- 2.7.0.rc3.207.g0ac5344
