Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only show trace messages when tracing is enabled

Browse Source
This commit is contained in:
Eelco Dolstra
2013-09-02 12:01:04 +02:00
parent efe4289464
commit b29d3f4aee
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libstore/build.cc
View File

@@ -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;