[commit: Cabal] master: Use defaultInstallFlags as the defaults (2546b40)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2546b40c1973634f84f8afe42b25490dd8ef5bfd

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

commit 2546b40c1973634f84f8afe42b25490dd8ef5bfd
Author: Duncan Coutts <duncan at haskell.org>
Date:   Tue Jul 7 00:48:36 2009 +0000

    Use defaultInstallFlags as the defaults

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

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

diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index ac29253..251ada3 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -245,7 +245,7 @@ installWithPlanner planner verbosity packageDBs repos comp conf
       useLoggingHandle = Nothing,
       useWorkingDir    = Nothing
     }
-    reportingLevel = fromFlagOrDefault NoReports (installBuildReports installFlags)
+    reportingLevel = fromFlag (installBuildReports installFlags)
     useLogFile :: FilePath -> Maybe (PackageIdentifier -> FilePath)
     useLogFile logsDir = fmap substLogFileName logFileTemplate
       where
@@ -259,7 +259,7 @@ installWithPlanner planner verbosity packageDBs repos comp conf
                                   . substPathTemplate env
                                   $ template
       where env = initialPathTemplateEnv (packageId pkg) (compilerId comp)
-    dryRun       = fromFlagOrDefault False (installDryRun installFlags)
+    dryRun       = fromFlag (installDryRun installFlags)
     miscOptions  = InstallMisc {
       rootCmd    = if fromFlag (configUserInstall configFlags)
                      then Nothing      -- ignore --root-cmd if --user.
@@ -401,7 +401,7 @@ planRepoPackages defaultPref comp configFlags configExFlags installFlags
 
   deps' <- IndexUtils.disambiguateDependencies available deps
   let installed'
-        | fromFlagOrDefault False (installReinstall installFlags)
+        | fromFlag (installReinstall installFlags)
                     = fmap (hideGivenDeps deps') installed
         | otherwise = installed
       targets     = dependencyTargets deps'
@@ -670,8 +670,7 @@ installUnpackedPackage verbosity scriptOptions miscOptions
       buildDistPref  = configDistPref configFlags,
       buildVerbosity = toFlag verbosity'
     }
-    shouldHaddock    = fromFlagOrDefault False
-                         (installDocumentation installConfigFlags)
+    shouldHaddock    = fromFlag (installDocumentation installConfigFlags)
     haddockFlags _   = emptyHaddockFlags {
       haddockDistPref  = configDistPref configFlags,
       haddockVerbosity = toFlag verbosity'
diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index 23d0f90..694a2d2 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -17,7 +17,8 @@ import Distribution.Client.Setup
          ( GlobalFlags(..), globalCommand, globalRepos
          , ConfigFlags(..)
          , ConfigExFlags(..), configureExCommand
-         , InstallFlags(..), installCommand, upgradeCommand
+         , InstallFlags(..), defaultInstallFlags
+         , installCommand, upgradeCommand
          , fetchCommand, checkCommand
          , updateCommand
          , ListFlags(..), listCommand
@@ -195,7 +196,8 @@ installAction (configFlags, configExFlags, installFlags)
                                  (configUserInstall configFlags)
   let configFlags'   = savedConfigureFlags   config `mappend` configFlags
       configExFlags' = savedConfigureExFlags config `mappend` configExFlags
-      installFlags'  = savedInstallFlags     config `mappend` installFlags
+      installFlags'  = defaultInstallFlags          `mappend`
+                       savedInstallFlags     config `mappend` installFlags
       globalFlags'   = savedGlobalFlags      config `mappend` globalFlags
   (comp, conf) <- configCompilerAux configFlags'
   install verbosity