[commit: Cabal] master: Print the location of the config file in the global --help (7e71bec)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/7e71bec8505b9bf3a046ee132b375ebf10a2efcd

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

commit 7e71bec8505b9bf3a046ee132b375ebf10a2efcd
Author: Duncan Coutts <duncan at haskell.org>
Date:   Tue Jan 13 19:22:15 2009 +0000

    Print the location of the config file in the global --help
    Ticket #413

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

 cabal-install/Distribution/Client/Config.hs |    1 +
 cabal-install/Main.hs                       |    9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cabal-install/Distribution/Client/Config.hs b/cabal-install/Distribution/Client/Config.hs
index a0cb6df..bf062c6 100644
--- a/cabal-install/Distribution/Client/Config.hs
+++ b/cabal-install/Distribution/Client/Config.hs
@@ -19,6 +19,7 @@ module Distribution.Client.Config (
     parseConfig,
 
     defaultCabalDir,
+    defaultConfigFile,
     defaultCacheDir,
     defaultLogsDir,
   ) where
diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index 3c1fa6d..e07a9a9 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -40,7 +40,7 @@ import Distribution.Client.Types
 import Distribution.Client.SetupWrapper
          ( setupWrapper, SetupScriptOptions(..), defaultSetupScriptOptions )
 import Distribution.Client.Config
-         ( SavedConfig(..), loadConfig )
+         ( SavedConfig(..), loadConfig, defaultConfigFile )
 import Distribution.Client.List             (list)
 import Distribution.Client.Install          (install, upgrade)
 import Distribution.Client.Update           (update)
@@ -93,7 +93,12 @@ mainWorker args =
         CommandReadyToGo action        -> action globalflags
 
   where
-    printHelp help = getProgName >>= putStr . help
+    printHelp help = do
+      pname <- getProgName
+      configFile <- defaultConfigFile
+      putStr (help pname)
+      putStr $ "\nYou can edit the cabal configuration file to set defaults:\n"
+            ++ "  " ++ configFile ++ "\n"
     printOptionsList = putStr . unlines
     printErrors errs = do
       putStr (concat (intersperse "\n" errs))