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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1bf24e5891e1d46c197d2030625213742b2571b9

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

commit 1bf24e5891e1d46c197d2030625213742b2571b9
Author: Duncan Coutts <[email protected]>
Date:   Wed Jul 30 13:20:04 2008 +0000

    Use the setupWrapper useWorkingDir feature in Install
    Rather than calling inDir directly.

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

 cabal-install/Distribution/Client/Install.hs |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cabal-install/Distribution/Client/Install.hs 
b/cabal-install/Distribution/Client/Install.hs
index 9aeb6f5..ba2ada5 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -329,10 +329,11 @@ installUnpackedPackage verbosity scriptOptions 
miscOptions configFlags pkg mpath
             return BuildOk
   where
     buildCommand     = Cabal.buildCommand defaultProgramConfiguration
-    setup cmd flags  = inDir mpath $
-                         setupWrapper verbosity scriptOptions
-                           (Just $ PackageDescription.packageDescription pkg)
-                           cmd flags []
+    setup cmd flags  =
+      setupWrapper verbosity
+        scriptOptions { useWorkingDir = mpath }
+        (Just $ PackageDescription.packageDescription pkg)
+        cmd flags []
     reexec cmd = do
       -- look for our on executable file and re-exec ourselves using
       -- a helper program like sudo to elevate priviledges:



_______________________________________________
Cvs-libraries mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-libraries

Reply via email to