[commit: packages/Cabal] ghc-head: Make configAbsolutePaths work with sandboxes. (176d8a0)

[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=176d8a0f8e309064c78a427238a6db1ef18e7c00

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

commit 176d8a0f8e309064c78a427238a6db1ef18e7c00
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Sun May 5 19:23:45 2013 +0200

    Make configAbsolutePaths work with sandboxes.
    
    The package DB dir is created *after* we've changed the 'configPackageDBs'
    setting with 'setPackageDB'.
    
    Aside: we really need some functional tests for sandboxes.


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

176d8a0f8e309064c78a427238a6db1ef18e7c00
 cabal-install/Main.hs |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index bafb13e..7be7bdb 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -475,9 +475,10 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
   -- If we're working inside a sandbox and the user has set the -w option, we
   -- may need to create a sandbox-local package DB for this compiler and add a
   -- timestamp record for this compiler to the timestamp file.
-  configFlags'' <- configAbsolutePaths $ case useSandbox of
-        NoSandbox               -> configFlags'
-        (UseSandbox sandboxDir) -> setPackageDB sandboxDir
+  configFlags'' <- case useSandbox of
+        NoSandbox               -> configAbsolutePaths $ configFlags'
+        (UseSandbox sandboxDir) -> return $
+                                   setPackageDB sandboxDir
                                    comp platform configFlags'
 
   whenUsingSandbox useSandbox $ \sandboxDir -> do