Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/ba260af90766c9ae1eb104695fb79614812e9a21 >--------------------------------------------------------------- commit ba260af90766c9ae1eb104695fb79614812e9a21 Author: Duncan Coutts <[email protected]> Date: Tue Jan 15 20:02:58 2008 +0000 Have command line args override saved config not the other way around Fixes setting the --prefix from the command line which was previously being ignored in favour of the default prefix from the config file. >--------------------------------------------------------------- cabal-install/Main.hs | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs index 504b26d..b123105 100644 --- a/cabal-install/Main.hs +++ b/cabal-install/Main.hs @@ -112,8 +112,8 @@ installAction flags extraArgs = do configFile <- defaultConfigFile --FIXME let verbosity = fromFlagOrDefault normal (Cabal.configVerbose flags) config <- loadConfig verbosity configFile - let flags' = flags `mappend` - savedConfigToConfigFlags (Cabal.configPackageDB flags) config + let flags' = savedConfigToConfigFlags (Cabal.configPackageDB flags) config + `mappend` flags (comp, conf) <- configCompilerAux flags' install verbosity (fromFlag $ Cabal.configPackageDB flags') (configRepos config) @@ -150,8 +150,8 @@ upgradeAction flags _extraArgs = do configFile <- defaultConfigFile --FIXME let verbosity = fromFlagOrDefault normal (Cabal.configVerbose flags) config <- loadConfig verbosity configFile - let flags' = flags `mappend` - savedConfigToConfigFlags (Cabal.configPackageDB flags) config + let flags' = savedConfigToConfigFlags (Cabal.configPackageDB flags) config + `mappend` flags (comp, conf) <- configCompilerAux flags' upgrade verbosity (fromFlag $ Cabal.configPackageDB flags') (configRepos config) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
