about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-11-27T18·56-0500
committerglittershark <grfn@gws.fyi>2020-11-27T19·06+0000
commite772f38a5e19dc2f1cdd6c5b9175693eb17c0249 (patch)
tree026aa99bd9ec8cc77bf36cb6b7f6af9b93018d80
parentad9d660d9f6d4c6fe3258d2d8d52e58bd0c9f6d8 (diff)
fix(tvix): Don't double-up on endlines from log messages r/1933
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
-rw-r--r--third_party/nix/src/libstore/build.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/nix/src/libstore/build.cc b/third_party/nix/src/libstore/build.cc
index d3a096a888..874b9d0e05 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) {