wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 19:01:16 +02:00
Code Activity

Merge pull request #12745 from obsidiansystems/append-log-tail-error-msg-type

Browse source 
`appendLogTailErrorMsg`: Take a "smaller" arugment
This commit is contained in:
mergify[bot] 2025-03-24 16:05:32 +00:00 • committed by GitHub
commit 7da2e5ba6a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -873,7 +873,7 @@ void runPostBuildHook(
void appendLogTailErrorMsg( void appendLogTailErrorMsg(
Worker & worker, const Store & store,
const StorePath & drvPath, const StorePath & drvPath,
const std::list<std::string> & logTail, const std::list<std::string> & logTail,
std::string & msg) std::string & msg)
@ -893,7 +893,7 @@ void appendLogTailErrorMsg(
// command will not put it at the start of the line unfortunately. // 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, msg += fmt("For full logs, run:\n " ANSI_BOLD "%s %s" ANSI_NORMAL,
nixLogCommand, nixLogCommand,
worker.store.printStorePath(drvPath)); store.printStorePath(drvPath));
} }
} }
@ -940,7 +940,7 @@ Goal::Co DerivationGoal::hookDone()
Magenta(worker.store.printStorePath(drvPath)), Magenta(worker.store.printStorePath(drvPath)),
statusToString(status)); statusToString(status));
appendLogTailErrorMsg(worker, drvPath, logTail, msg); appendLogTailErrorMsg(worker.store, drvPath, logTail, msg);
outputLocks.unlock(); outputLocks.unlock();

2
src/libstore/build/derivation-goal.hh
View file

@ -64,7 +64,7 @@ void runPostBuildHook(
/** Used internally */ /** Used internally */
void appendLogTailErrorMsg( void appendLogTailErrorMsg(
Worker & worker, const Store & store,
const StorePath & drvPath, const StorePath & drvPath,
const std::list<std::string> & logTail, const std::list<std::string> & logTail,
std::string & msg); std::string & msg);

2
src/libstore/unix/build/local-derivation-goal.cc
View file

@ -621,7 +621,7 @@ Goal::Co LocalDerivationGoal::tryLocalBuild()
Magenta(worker.store.printStorePath(drvPath)), Magenta(worker.store.printStorePath(drvPath)),
statusToString(status)); statusToString(status));
appendLogTailErrorMsg(worker, drvPath, logTail, msg); appendLogTailErrorMsg(worker.store, drvPath, logTail, msg);
if (diskFull) if (diskFull)
msg += "\nnote: build failure may have been caused by lack of free disk space"; msg += "\nnote: build failure may have been caused by lack of free disk space";