about summary refs log tree commit diff
path: root/src/libstore/build.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-09-02T10·01+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-09-02T10·01+0200
commitb29d3f4aee9fa91f4ea1019d09bf63bc81b9f830 (patch)
tree37b9f7a7ee73545abfe7448ca5e2cb282dbbef97 /src/libstore/build.cc
parentefe428946431c6c670151c949884fa8c1fa31794 (diff)
Only show trace messages when tracing is enabled
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r--src/libstore/build.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 25bf848ca697..51314f7368f0 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -996,7 +996,7 @@ void DerivationGoal::killChild()
 
 void DerivationGoal::cancel(bool timeout)
 {
-    if (timeout)
+    if (settings.printBuildTrace && timeout)
         printMsg(lvlError, format("@ build-failed %1% - timeout") % drvPath);
     killChild();
     amDone(ecFailed);
@@ -1609,9 +1609,8 @@ void DerivationGoal::buildDone()
     /* Release the build user, if applicable. */
     buildUser.release();
 
-    if (settings.printBuildTrace) {
+    if (settings.printBuildTrace)
         printMsg(lvlError, format("@ build-succeeded %1% -") % drvPath);
-    }
 
     amDone(ecSuccess);
 }
@@ -2649,7 +2648,7 @@ SubstitutionGoal::~SubstitutionGoal()
 
 void SubstitutionGoal::cancel(bool timeout)
 {
-    if (timeout)
+    if (settings.printBuildTrace && timeout)
         printMsg(lvlError, format("@ substituter-failed %1% timeout") % storePath);
     if (pid != -1) {
         pid_t savedPid = pid;