From 2ff9df2f49421a982b613ed5448d64deb3dcaaaa Mon Sep 17 00:00:00 2001
From: Duncan Coutts <duncan@haskell.org>
Date: Sat, 29 Mar 2008 19:44:26 +0000
Subject: [PATCH] Use new showPWarning for warnings in parsing the config file
---
cabal-install/Hackage/Config.hs | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/cabal-install/Hackage/Config.hs b/cabal-install/Hackage/Config.hs
index 4385ca55e7..d121d753bc 100644
--- a/cabal-install/Hackage/Config.hs
+++ b/cabal-install/Hackage/Config.hs
@@ -34,7 +34,7 @@ import Distribution.Compiler (CompilerFlavor(..), defaultCompilerFlavor)
import Distribution.PackageDescription.Parse (ParseResult(..))
import Distribution.ParseUtils
( FieldDescr(..), simpleField, listField, liftField, field
- , parseFilePathQ, parseTokenQ, PWarning(..) )
+ , parseFilePathQ, parseTokenQ, showPWarning )
import Distribution.Simple.Compiler (PackageDB(..))
import Distribution.Simple.InstallDirs
( InstallDirs(..), PathTemplate, toPathTemplate, fromPathTemplate )
@@ -165,9 +165,8 @@ loadConfig verbosity configFile =
return defaultConf
Just inp -> case parseBasicStanza configFieldDescrs defaultConf inp of
ParseOk ws conf ->
- do when (not $ null ws) $
- warn verbosity $ "Config file: "
- ++ unlines [ m | PWarning m <- ws ]
+ do when (not $ null ws) $ warn verbosity $
+ unlines (map (showPWarning configFile) ws)
return conf
ParseFailed err ->
do warn verbosity $ "Error parsing config file "
--
GitLab