Browse files

Merge git://github.com/haskell/cabal

  • Loading branch information...
2 parents 997ef04 + ce7aa8a commit 532e349ec6ee33fc3477137b44f108d3658d0528 @igfoo igfoo committed Nov 8, 2012
View
2 cabal-install/Distribution/Client/Haddock.hs
@@ -51,7 +51,7 @@ regenerateHaddockIndex verbosity pkgs conf index = do
createDirectoryIfMissing True destDir
- withTempDirectory verbosity destDir "tmphaddock" $ \tempDir -> do
+ withTempDirectory verbosity False destDir "tmphaddock" $ \tempDir -> do
let flags = [ "--gen-contents"
, "--gen-index"
View
2 cabal-install/Distribution/Client/Install.hs
@@ -1011,7 +1011,7 @@ installLocalTarballPackage
-> IO BuildResult
installLocalTarballPackage verbosity jobLimit pkgid tarballPath installPkg = do
tmp <- getTemporaryDirectory
- withTempDirectory verbosity tmp (display pkgid) $ \tmpDirPath ->
+ withTempDirectory verbosity False tmp (display pkgid) $ \tmpDirPath ->
onFailure UnpackFailed $ do
let relUnpackedPath = display pkgid
absUnpackedPath = tmpDirPath </> relUnpackedPath
View
2 cabal-install/Distribution/Client/SrcDist.hs
@@ -71,7 +71,7 @@ sdist flags exflags = do
Nothing -> do
createDirectoryIfMissingVerbose verbosity True tmpTargetDir
- withTempDirectory verbosity tmpTargetDir "sdist." $ \tmpDir -> do
+ withTempDirectory verbosity False tmpTargetDir "sdist." $ \tmpDir -> do
let targetDir = tmpDir </> tarBallName pkg'
generateSourceDir targetDir pkg' mb_lbi
targzFile <- createArchive verbosity format pkg' tmpDir targetPref

0 comments on commit 532e349

Please sign in to comment.