[commit: Cabal] master: Only look for detailed build reports if we were generating them (18570f7)
Ian Lynagh
igloo at earth.li
Fri Jun 24 01:58:23 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/18570f7389b6a05feab2dfd3c68db7413381a767
>---------------------------------------------------------------
commit 18570f7389b6a05feab2dfd3c68db7413381a767
Author: Duncan Coutts <duncan at haskell.org>
Date: Thu Aug 14 18:48:37 2008 +0000
Only look for detailed build reports if we were generating them
>---------------------------------------------------------------
cabal-install/Distribution/Client/Install.hs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index 5eed080..3493355 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -178,7 +178,8 @@ installWithPlanner planner verbosity packageDB repos comp conf configFlags insta
let buildReports = BuildReports.fromInstallPlan installPlan'
BuildReports.storeAnonymous buildReports
BuildReports.storeLocal buildReports
- storeDetailedBuildReports logsDir buildReports
+ when useDetailedBuildReports $
+ storeDetailedBuildReports logsDir buildReports
symlinkBinaries verbosity configFlags installFlags installPlan'
printBuildFailures installPlan'
@@ -194,12 +195,12 @@ installWithPlanner planner verbosity packageDB repos comp conf configFlags insta
useLoggingHandle = Nothing,
useWorkingDir = Nothing
}
+ useDetailedBuildReports = Cabal.fromFlag (installBuildReports installFlags)
useLogFile :: FilePath -> Maybe (PackageIdentifier -> FilePath)
useLogFile logsDir = fmap substLogFileName logFileTemplate
where
logFileTemplate
- | Cabal.fromFlagOrDefault False (installBuildReports installFlags)
- = Just $ logsDir </> "$pkgid" <.> "log"
+ | useDetailedBuildReports = Just $ logsDir </> "$pkgid" <.> "log"
| otherwise = Cabal.flagToMaybe (installLogFile installFlags)
substLogFileName path pkg = fromPathTemplate
. substPathTemplate env
More information about the Cvs-libraries
mailing list