[pkg-haskell-tools] 02/02: Merge branch 'master' of ssh://anonscm.debian.org/git/pkg-haskell/pkg-haskell-tools

[Sven Bartscher]

This is an automated email from the git hooks/post-receive script.

svenb-guest pushed a commit to branch master
in repository pkg-haskell-tools.

commit 5b82836e183b65a9c154cd2e5685ea36d2f7a2ef
Merge: 469f1f1 29a68cd
Author: Sven Bartscher <sven.bartscher at weltraumschlangen.de>
Date:   Wed Aug 19 09:45:23 2015 +0200

    Merge branch 'master' of ssh://anonscm.debian.org/git/pkg-haskell/pkg-haskell-tools

 dht.cabal       |  5 ++++-
 src/Utils.hs    | 41 +++++++++++++++++++++++++++++++++++++++++
 src/make-all.hs | 16 ++++++++++++----
 3 files changed, 57 insertions(+), 5 deletions(-)

diff --cc src/make-all.hs
index 5f2f342,7a2c410..4fbbb64
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@@ -391,8 -401,8 +401,7 @@@ shakeMain conf@(Conf {..}) = d
              map (makeRelative targetDir) <$>
              liftIO (listFiles targetDir)
          let localDepPkgs = map debFileNameToPackage localDebs
--
-         withTempDir $ \tmpdir -> do
+         withTempDir baseTmpDir $ \tmpdir -> do
              -- Now monkey-patch dependencies out of the package lists
              let fixup = tmpdir </> "fixup.sh"
              liftIO $ writeFile fixup  $ fixupScript localDepPkgs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/pkg-haskell-tools.git