[commit: packages/Cabal] ghc-head: Fix another issue caused by 'user-install: True'. (231f722)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=231f722339c69f72fcfaf1649fb263e2262210ff

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

commit 231f722339c69f72fcfaf1649fb263e2262210ff
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Sun May 12 17:35:20 2013 +0200

    Fix another issue caused by 'user-install: True'.
    
    I'm starting to think that it's better to set it to False and solve the rootCmd
    problem in another way.


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

231f722339c69f72fcfaf1649fb263e2262210ff
 cabal-install/Main.hs |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index b74171d..0fd99e0 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -226,6 +226,12 @@ configureAction (configFlags, configExFlags) extraArgs globalFlags = do
                           (globalConfigFile globalFlags)
                           (configUserInstall configFlags)
   let configFlags'   = savedConfigureFlags   config `mappend` configFlags
+                       -- See the comment in D.C.Sandbox. Otherwise configure
+                       -- adds the user package DB to the package DB stack.
+                       -- FIXME: Maybe we should set configUserInstall = False
+                       -- and fix the sudo issue in some other way?
+                       { configUserInstall = Flag False}
+
       configExFlags' = savedConfigureExFlags config `mappend` configExFlags
       globalFlags'   = savedGlobalFlags      config `mappend` globalFlags
   (comp, platform, conf) <- configCompilerAux configFlags'