[commit: Cabal] master: Don't override config with install defaults (e8ee02b)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e8ee02b7c7ce5a48d25582a533edcb72492d9dc9

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

commit e8ee02b7c7ce5a48d25582a533edcb72492d9dc9
Author: Duncan Coutts <duncan at haskell.org>
Date:   Fri Aug 22 22:19:26 2008 +0000

    Don't override config with install defaults

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

 cabal-install/Distribution/Client/Install.hs |    6 +++---
 cabal-install/Distribution/Client/Setup.hs   |    2 +-
 cabal-install/Main.hs                        |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index f6caa4d..7466630 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -202,7 +202,7 @@ installWithPlanner planner verbosity packageDB repos comp conf configFlags insta
       useLoggingHandle = Nothing,
       useWorkingDir    = Nothing
     }
-    useDetailedBuildReports = Cabal.fromFlag (installBuildReports installFlags)
+    useDetailedBuildReports = Cabal.fromFlagOrDefault False (installBuildReports installFlags)
     useLogFile :: FilePath -> Maybe (PackageIdentifier -> FilePath)
     useLogFile logsDir = fmap substLogFileName logFileTemplate
       where
@@ -214,7 +214,7 @@ installWithPlanner planner verbosity packageDB repos comp conf configFlags insta
                               . toPathTemplate
                               $ path
       where env = initialPathTemplateEnv (packageId pkg) (compilerId comp)
-    dryRun       = Cabal.fromFlag (installDryRun installFlags)
+    dryRun       = Cabal.fromFlagOrDefault False (installDryRun installFlags)
     miscOptions  = InstallMisc {
       rootCmd    = if Cabal.fromFlag (Cabal.configUserInstall configFlags)
                      then Nothing      -- ignore --root-cmd if --user.
@@ -268,7 +268,7 @@ planRepoPackages :: PackagesVersionPreference -> Compiler -> InstallFlags
 planRepoPackages pref comp installFlags deps installed available = do
   deps' <- IndexUtils.disambiguateDependencies available deps
   let installed'
-        | Cabal.fromFlag (installReinstall installFlags)
+        | Cabal.fromFlagOrDefault False (installReinstall installFlags)
                     = fmap (hideGivenDeps deps') installed
         | otherwise = installed
   return $ resolveDependenciesWithProgress buildOS buildArch (compilerId comp)
diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs
index 15b6d29..8ac73e6 100644
--- a/cabal-install/Distribution/Client/Setup.hs
+++ b/cabal-install/Distribution/Client/Setup.hs
@@ -357,7 +357,7 @@ installCommand = configureCommand {
   commandName         = "install",
   commandSynopsis     = "Installs a list of packages.",
   commandUsage        = usagePackages "install",
-  commandDefaultFlags = (mempty, defaultInstallFlags),
+  commandDefaultFlags = (mempty, mempty),
   commandOptions      = \showOrParseArgs ->
     liftOptionsFst (commandOptions configureCommand showOrParseArgs) ++
     liftOptionsSnd (installOptions showOrParseArgs)
diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index ce9a0e5..1c7f8f2 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -166,7 +166,7 @@ configureAction flags extraArgs globalFlags = do
 
 installAction :: (ConfigFlags, InstallFlags) -> [String] -> GlobalFlags -> IO ()
 installAction (cflags,iflags) _ _globalFlags
-  | fromFlag (installOnly iflags)
+  | fromFlagOrDefault False (installOnly iflags)
   = let verbosity = fromFlagOrDefault normal (configVerbosity cflags)
     in setupWrapper verbosity defaultSetupScriptOptions Nothing
          installCommand mempty []