From e772f38a5e19dc2f1cdd6c5b9175693eb17c0249 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Fri, 27 Nov 2020 13:56:38 -0500 Subject: fix(tvix): Don't double-up on endlines from log messages Change-Id: I676dd4e9d8b1a7ff5389323e0462ba6681d62cf0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2168 Reviewed-by: andi Reviewed-by: kanepyork Tested-by: BuildkiteCI --- third_party/nix/src/libstore/build.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/nix/src/libstore/build.cc b/third_party/nix/src/libstore/build.cc index d3a096a888fe..874b9d0e0514 100644 --- a/third_party/nix/src/libstore/build.cc +++ b/third_party/nix/src/libstore/build.cc @@ -3836,7 +3836,7 @@ void DerivationGoal::handleEOF(int /* fd */) { void DerivationGoal::flushLine() { if (settings.verboseBuild && (settings.printRepeatedBuilds || curRound == 1)) { - log_sink() << absl::StrCat(currentLogLine, "\n") << std::endl; + log_sink() << currentLogLine << std::endl; } else { logTail.push_back(currentLogLine); if (logTail.size() > settings.logLines) { -- cgit 1.4.1