nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-24 03:09:35 +01:00
Code Activity

Make appendLogTailErrorMsg as class method after all

Browse source 
The other parameters it took were somewhat implementation-specific.
This commit is contained in:
John Ericson 2025-03-16 16:48:41 -04:00
parent 89ba6dff66
commit e83ef7a477
3 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/build/derivation-goal.cc
View file

@ -879,11 +879,7 @@ void runPostBuildHook(
}
void appendLogTailErrorMsg(
const Store & store,
const StorePath & drvPath,
const std::list<std::string> & logTail,
std::string & msg)
void DerivationGoal::appendLogTailErrorMsg(std::string & msg)
{
if (!logger->isVerbose() && !logTail.empty()) {
msg += fmt(";\nlast %d log lines:\n", logTail.size());
@ -900,7 +896,7 @@ void appendLogTailErrorMsg(
// command will not put it at the start of the line unfortunately.
msg += fmt("For full logs, run:\n " ANSI_BOLD "%s %s" ANSI_NORMAL,
nixLogCommand,
store.printStorePath(drvPath));
worker.store.printStorePath(drvPath));
}
}
@ -947,7 +943,7 @@ Goal::Co DerivationGoal::hookDone()
Magenta(worker.store.printStorePath(drvPath)),
statusToString(status));
appendLogTailErrorMsg(worker.store, drvPath, logTail, msg);
appendLogTailErrorMsg(msg);
outputLocks.unlock();