mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix): Don't double-up on endlines from log messages

Browse source 
Change-Id: I676dd4e9d8b1a7ff5389323e0462ba6681d62cf0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2168
Reviewed-by: andi <andi@notmuch.email>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Tested-by: BuildkiteCI
This commit is contained in:
Griffin Smith 2020-11-27 13:56:38 -05:00 committed by glittershark
parent ad9d660d9f
commit e772f38a5e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
third_party/nix/src/libstore/build.cc vendored
View file

@ -3836,7 +3836,7 @@ void DerivationGoal::handleEOF(int /* fd */) {
void DerivationGoal::flushLine() { void DerivationGoal::flushLine() {
if (settings.verboseBuild && if (settings.verboseBuild &&
(settings.printRepeatedBuilds || curRound == 1)) { (settings.printRepeatedBuilds || curRound == 1)) {
log_sink() << absl::StrCat(currentLogLine, "\n") << std::endl; log_sink() << currentLogLine << std::endl;
} else { } else {
logTail.push_back(currentLogLine); logTail.push_back(currentLogLine);
if (logTail.size() > settings.logLines) { if (logTail.size() > settings.logLines) {