[commit: Cabal] master: Use new showPWarning for warnings in parsing the config file (08c95d2)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/08c95d2db1b92085808d700cad77d475b2e97adb

>---------------------------------------------------------------

commit 08c95d2db1b92085808d700cad77d475b2e97adb
Author: Duncan Coutts <duncan at haskell.org>
Date:   Sat Mar 29 19:44:26 2008 +0000

    Use new showPWarning for warnings in parsing the config file

>---------------------------------------------------------------

 cabal-install/Hackage/Config.hs |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cabal-install/Hackage/Config.hs b/cabal-install/Hackage/Config.hs
index 4385ca5..d121d75 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 "