[commit: Cabal] : Fix fromFlag error in upgrade (2bc80f8)

[Ian Lynagh]

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

On branch  : 

http://hackage.haskell.org/trac/ghc/changeset/2bc80f8fd2b23d6b7310f4c4aac04396675a1411

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

commit 2bc80f8fd2b23d6b7310f4c4aac04396675a1411
Author: Duncan Coutts <duncan at haskell.org>
Date:   Mon Dec 21 14:07:52 2009 +0000

    Fix fromFlag error in upgrade
    Use the missing defaultInstallFlags.

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

 cabal-install/Main.hs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index 9736b9a..fd05f5f 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -259,7 +259,8 @@ upgradeAction (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'
   upgrade verbosity