aboutsummaryrefslogtreecommitdiff
path: root/src/libmain
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-09-30 00:42:28 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-09-30 00:42:28 +0000
commit69afaeace355ab78010f0d849206ef4a4805d016 (patch)
treea8553d4eb406861149736443938a293c1a64ee8d /src/libmain
parentb7597016529cebdc3c9432a101c1f8d9227713cc (diff)
parent76f000712ed3aa8f258d68fc5ef036f1255dfada (diff)
Merge remote-tracking branch 'upstream/master' into templated-daemon-protocol
Diffstat (limited to 'src/libmain')
-rw-r--r--src/libmain/progress-bar.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc
index be3c06a38..07b45b3b5 100644
--- a/src/libmain/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
@@ -256,7 +256,7 @@ public:
}
else if (type == resBuildLogLine || type == resPostBuildLogLine) {
- auto lastLine = trim(getS(fields, 0));
+ auto lastLine = chomp(getS(fields, 0));
if (!lastLine.empty()) {
auto i = state->its.find(act);
assert(i != state->its.end());