[commit: packages/Cabal] ghc-head: invokeSetupScript: use the passed-in argument everywhere. (39b13a1)

[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=39b13a1f5cd08146367fcb3a3345f8397c564447

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

commit 39b13a1f5cd08146367fcb3a3345f8397c564447
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Mon Aug 19 10:52:30 2013 +0200

    invokeSetupScript: use the passed-in argument everywhere.
    
    The one from outer scope was used in some places before.


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

39b13a1f5cd08146367fcb3a3345f8397c564447
 cabal-install/Distribution/Client/SetupWrapper.hs |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cabal-install/Distribution/Client/SetupWrapper.hs b/cabal-install/Distribution/Client/SetupWrapper.hs
index 320a96e..4e279b2 100644
--- a/cabal-install/Distribution/Client/SetupWrapper.hs
+++ b/cabal-install/Distribution/Client/SetupWrapper.hs
@@ -429,7 +429,7 @@ externalSetupMethod verbosity options pkg bt mkargs = do
   invokeSetupScript :: SetupScriptOptions -> FilePath -> [String] -> IO ()
   invokeSetupScript options' path args = do
     info verbosity $ unwords (path : args)
-    case useLoggingHandle options of
+    case useLoggingHandle options' of
       Nothing        -> return ()
       Just logHandle -> info verbosity $ "Redirecting build log to "
                                       ++ show logHandle
@@ -445,7 +445,7 @@ externalSetupMethod verbosity options pkg bt mkargs = do
     env        <- getEffectiveEnvironment [("PATH", Just searchpath)]
 
     process <- runProcess path' args
-                 (useWorkingDir options) env
-                 Nothing (useLoggingHandle options) (useLoggingHandle options)
+                 (useWorkingDir options') env
+                 Nothing (useLoggingHandle options') (useLoggingHandle options')
     exitCode <- waitForProcess process
     unless (exitCode == ExitSuccess) $ exitWith exitCode