[commit: Cabal] master: Fix getting verbosity flags (0dcb2d3)

[Paolo Capriotti]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0dcb2d3277ab6732cc52f92d5c35e8c8e117533f

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

commit 0dcb2d3277ab6732cc52f92d5c35e8c8e117533f
Author: Duncan Coutts <duncan at haskell.org>
Date:   Fri Jan 11 02:56:34 2008 +0000

    Fix getting verbosity flags

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

 cabal-install/Main.hs |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index a48d77e..bf83a42 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -15,7 +15,8 @@ module Main where
 
 import Hackage.Setup
 import Distribution.PackageDescription (cabalVersion)
-import Distribution.Simple.Setup (Flag, fromFlag, flagToMaybe)
+import Distribution.Simple.Setup (Flag, fromFlag, fromFlagOrDefault,
+                                  flagToMaybe)
 import qualified Distribution.Simple.Setup as Cabal
 import Distribution.Simple.Program (defaultProgramConfiguration)
 import Distribution.Simple.Command
@@ -34,7 +35,7 @@ import Hackage.Fetch            (fetch)
 --import Hackage.Clean            (clean)
 import Hackage.Upload           (upload, check)
 
-import Distribution.Verbosity   (Verbosity)
+import Distribution.Verbosity   (Verbosity, normal)
 import Distribution.Version     (showVersion)
 import qualified Paths_cabal_install (version)
 
@@ -109,7 +110,7 @@ installAction :: Cabal.ConfigFlags -> [String] -> IO ()
 installAction flags extraArgs = do
   pkgs <- either die return (parsePackageArgs extraArgs)
   configFile <- defaultConfigFile --FIXME
-  let verbosity = fromFlag (Cabal.configVerbose flags)
+  let verbosity = fromFlagOrDefault normal (Cabal.configVerbose flags)
   config <- loadConfig verbosity configFile
   let flags' = flags `mappend`
                savedConfigToConfigFlags (Cabal.configPackageDB flags) config
@@ -147,7 +148,7 @@ updateAction verbosityFlag _extraArgs = do
 upgradeAction :: Cabal.ConfigFlags -> [String] -> IO ()
 upgradeAction flags _extraArgs = do
   configFile <- defaultConfigFile --FIXME
-  let verbosity = fromFlag (Cabal.configVerbose flags)
+  let verbosity = fromFlagOrDefault normal (Cabal.configVerbose flags)
   config <- loadConfig verbosity configFile
   let flags' = flags `mappend`
                savedConfigToConfigFlags (Cabal.configPackageDB flags) config