lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

In trace messages, don't print the output path

Browse source 
This doesn't work if there is no output named "out".  Hydra didn't use
it anyway.
This commit is contained in:
Eelco Dolstra 2013-05-10 00:24:33 +02:00
parent 6eba05613a
commit 2ee9da9e22
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/libstore/build.cc
View file

@ -1366,8 +1366,8 @@ void DerivationGoal::tryToBuild()
outputLocks.unlock(); outputLocks.unlock();
buildUser.release(); buildUser.release();
if (settings.printBuildTrace) if (settings.printBuildTrace)
printMsg(lvlError, format("@ build-failed %1% %2% %3% %4%") printMsg(lvlError, format("@ build-failed %1% - %2% %3%")
% drvPath % drv.outputs["out"].path % 0 % e.msg()); % drvPath % 0 % e.msg());
worker.permanentFailure = true; worker.permanentFailure = true;
amDone(ecFailed); amDone(ecFailed);
return; return;
@ -1539,11 +1539,11 @@ void DerivationGoal::buildDone()
if (settings.printBuildTrace) { if (settings.printBuildTrace) {
if (hook && hookError) if (hook && hookError)
printMsg(lvlError, format("@ hook-failed %1% %2% %3% %4%") printMsg(lvlError, format("@ hook-failed %1% - %2% %3%")
% drvPath % drv.outputs["out"].path % status % e.msg()); % drvPath % status % e.msg());
else else
printMsg(lvlError, format("@ build-failed %1% %2% %3% %4%") printMsg(lvlError, format("@ build-failed %1% - %2% %3%")
% drvPath % drv.outputs["out"].path % 1 % e.msg()); % drvPath % 1 % e.msg());
} }
/* Register the outputs of this build as "failed" so we won't /* Register the outputs of this build as "failed" so we won't
@ -1566,8 +1566,7 @@ void DerivationGoal::buildDone()
buildUser.release(); buildUser.release();
if (settings.printBuildTrace) { if (settings.printBuildTrace) {
printMsg(lvlError, format("@ build-succeeded %1% %2%") printMsg(lvlError, format("@ build-succeeded %1% -") % drvPath);
% drvPath % drv.outputs["out"].path);
} }
amDone(ecSuccess); amDone(ecSuccess);
@ -1649,8 +1648,8 @@ HookReply DerivationGoal::tryBuildHook()
worker.childStarted(shared_from_this(), hook->pid, fds, false, true); worker.childStarted(shared_from_this(), hook->pid, fds, false, true);
if (settings.printBuildTrace) if (settings.printBuildTrace)
printMsg(lvlError, format("@ build-started %1% %2% %3% %4%") printMsg(lvlError, format("@ build-started %1% - %2% %3%")
% drvPath % drv.outputs["out"].path % drv.platform % logFile); % drvPath % drv.platform % logFile);
return rpAccept; return rpAccept;
} }
@ -2031,8 +2030,8 @@ void DerivationGoal::startBuilder()
singleton<set<int> >(builderOut.readSide), true, true); singleton<set<int> >(builderOut.readSide), true, true);
if (settings.printBuildTrace) { if (settings.printBuildTrace) {
printMsg(lvlError, format("@ build-started %1% %2% %3% %4%") printMsg(lvlError, format("@ build-started %1% - %2% %3%")
% drvPath % drv.outputs["out"].path % drv.platform % logFile); % drvPath % drv.platform % logFile);
} }
} }
@ -2468,7 +2467,7 @@ bool DerivationGoal::pathFailed(const Path & path)
printMsg(lvlError, format("builder for `%1%' failed previously (cached)") % path); printMsg(lvlError, format("builder for `%1%' failed previously (cached)") % path);
if (settings.printBuildTrace) if (settings.printBuildTrace)
printMsg(lvlError, format("@ build-failed %1% %2% cached") % drvPath % path); printMsg(lvlError, format("@ build-failed %1% - cached") % drvPath);
worker.permanentFailure = true; worker.permanentFailure = true;
amDone(ecFailed); amDone(ecFailed);
@ -2774,10 +2773,8 @@ void SubstitutionGoal::tryToRun()
state = &SubstitutionGoal::finished; state = &SubstitutionGoal::finished;
if (settings.printBuildTrace) { if (settings.printBuildTrace)
printMsg(lvlError, format("@ substituter-started %1% %2%") printMsg(lvlError, format("@ substituter-started %1% %2%") % storePath % sub);
% storePath % sub);
}
} }
@ -2864,9 +2861,8 @@ void SubstitutionGoal::finished()
printMsg(lvlChatty, printMsg(lvlChatty,
format("substitution of path `%1%' succeeded") % storePath); format("substitution of path `%1%' succeeded") % storePath);
if (settings.printBuildTrace) { if (settings.printBuildTrace)
printMsg(lvlError, format("@ substituter-succeeded %1%") % storePath); printMsg(lvlError, format("@ substituter-succeeded %1%") % storePath);
}
amDone(ecSuccess); amDone(ecSuccess);
} }