mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-13 01:36:15 +02:00
Only show trace messages when tracing is enabled
This commit is contained in:
parent
efe4289464
commit
b29d3f4aee
1 changed files with 3 additions and 4 deletions
|
@ -996,7 +996,7 @@ void DerivationGoal::killChild()
|
||||||
|
|
||||||
void DerivationGoal::cancel(bool timeout)
|
void DerivationGoal::cancel(bool timeout)
|
||||||
{
|
{
|
||||||
if (timeout)
|
if (settings.printBuildTrace && timeout)
|
||||||
printMsg(lvlError, format("@ build-failed %1% - timeout") % drvPath);
|
printMsg(lvlError, format("@ build-failed %1% - timeout") % drvPath);
|
||||||
killChild();
|
killChild();
|
||||||
amDone(ecFailed);
|
amDone(ecFailed);
|
||||||
|
@ -1609,9 +1609,8 @@ void DerivationGoal::buildDone()
|
||||||
/* Release the build user, if applicable. */
|
/* Release the build user, if applicable. */
|
||||||
buildUser.release();
|
buildUser.release();
|
||||||
|
|
||||||
if (settings.printBuildTrace) {
|
if (settings.printBuildTrace)
|
||||||
printMsg(lvlError, format("@ build-succeeded %1% -") % drvPath);
|
printMsg(lvlError, format("@ build-succeeded %1% -") % drvPath);
|
||||||
}
|
|
||||||
|
|
||||||
amDone(ecSuccess);
|
amDone(ecSuccess);
|
||||||
}
|
}
|
||||||
|
@ -2649,7 +2648,7 @@ SubstitutionGoal::~SubstitutionGoal()
|
||||||
|
|
||||||
void SubstitutionGoal::cancel(bool timeout)
|
void SubstitutionGoal::cancel(bool timeout)
|
||||||
{
|
{
|
||||||
if (timeout)
|
if (settings.printBuildTrace && timeout)
|
||||||
printMsg(lvlError, format("@ substituter-failed %1% timeout") % storePath);
|
printMsg(lvlError, format("@ substituter-failed %1% timeout") % storePath);
|
||||||
if (pid != -1) {
|
if (pid != -1) {
|
||||||
pid_t savedPid = pid;
|
pid_t savedPid = pid;
|
||||||
|
|
Loading…
Reference in a new issue