[commit: Cabal] master: Use default configuration if we can't parse the config file. (56b5e9b)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/56b5e9bf3bbbf5aac6b3e5860e1aaed698c290fd

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

commit 56b5e9bf3bbbf5aac6b3e5860e1aaed698c290fd
Author: bjorn <bjorn at bringert.net>
Date:   Sun Oct 7 09:04:09 2007 +0000

    Use default configuration if we can't parse the config file.

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

 .../src/Network/Hackage/CabalInstall/Config.hs     |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Config.hs b/cabal-install/src/Network/Hackage/CabalInstall/Config.hs
index 97cfca9..50bdb71 100644
--- a/cabal-install/src/Network/Hackage/CabalInstall/Config.hs
+++ b/cabal-install/src/Network/Hackage/CabalInstall/Config.hs
@@ -194,7 +194,10 @@ loadConfig configFile =
                               case parseBasicStanza configFieldDescrs conf inp of
                                 ParseOk _ conf' -> return conf'
                        ParseFailed err -> 
-                           fail $ "Error parsing config file " ++ configFile ++ ": " ++ showPError err
+                           do hPutStrLn stderr $ "Error parsing config file " 
+                                            ++ configFile ++ ": " ++ showPError err
+                              hPutStrLn stderr $ "Using default configuration."
+                              return defaultConf
 
 -- FIXME: finish this
 writeDefaultConfigFile :: FilePath -> IO ()