[Notes] [Git][BuildStream/buildstream][tlater/message-lines] widget.py: Avoid "showing 0 lines" messages when there are no lines

[Tristan Maat <gitlab mg gitlab com>]

Title: GitLab

Tristan Maat pushed to branch tlater/message-lines at BuildStream / buildstream

Commits:

• 0a0b8a3d
  by Tristan Maat at 2019-01-02T19:35:29Z

  widget.py: Avoid "showing 0 lines" messages when there are no lines
  
  This happened when bst is invoked with --message-lines 0 or
  --error-lines 0, and was arguably a little too verbose (the user
  explicitly asked us not to show them any lines, after all).
  
  Fixes #779
  

1 changed file:

• buildstream/_frontend/widget.py

Changes:

buildstream/_frontend/widget.py

---

...	...	@@ -647,8 +647,9 @@ class LogLine(Widget):
647	647	abbrev = False
648	648	if message.message_type not in ERROR_MESSAGES \
649	649	and not frontend_message and n_lines > self._message_lines:
650		- abbrev = True
651	650	lines = lines[0:self._message_lines]
	651	+ if self._message_lines > 0:
	652	+ abbrev = True
652	653	else:
653	654	lines[n_lines - 1] = lines[n_lines - 1].rstrip('\n')
654	655
...	...	@@ -674,7 +675,7 @@ class LogLine(Widget):
674	675	if self.context is not None and not self.context.log_verbose:
675	676	text += self._indent + self._err_profile.fmt("Log file: ")
676	677	text += self._indent + self._logfile_widget.render(message) + '\n'
677		- else:
	678	+ elif self._log_lines > 0:
678	679	text += self._indent + self._err_profile.fmt("Printing the last {} lines from log file:"
679	680	.format(self._log_lines)) + '\n'
680	681	text += self._indent + self._logfile_widget.render(message, abbrev=False) + '\n'

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.