From b29d3f4aee9fa91f4ea1019d09bf63bc81b9f830 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 2 Sep 2013 12:01:04 +0200 Subject: [PATCH] Only show trace messages when tracing is enabled --- src/libstore/build.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 25bf848ca..51314f736 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;