diff options
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 484545a684..8b98da1771 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -647,7 +647,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): | |||
647 | if isinstance(event, logging.LogRecord): | 647 | if isinstance(event, logging.LogRecord): |
648 | lastprint = time.time() | 648 | lastprint = time.time() |
649 | printinterval = 5000 | 649 | printinterval = 5000 |
650 | if event.levelno >= bb.msg.BBLogFormatter.ERROR: | 650 | if event.levelno >= bb.msg.BBLogFormatter.ERRORONCE: |
651 | errors = errors + 1 | 651 | errors = errors + 1 |
652 | return_value = 1 | 652 | return_value = 1 |
653 | elif event.levelno == bb.msg.BBLogFormatter.WARNING: | 653 | elif event.levelno == bb.msg.BBLogFormatter.WARNING: |
@@ -661,10 +661,10 @@ def main(server, eventHandler, params, tf = TerminalFilter): | |||
661 | continue | 661 | continue |
662 | 662 | ||
663 | # Prefix task messages with recipe/task | 663 | # Prefix task messages with recipe/task |
664 | if event.taskpid in helper.pidmap and event.levelno != bb.msg.BBLogFormatter.PLAIN: | 664 | if event.taskpid in helper.pidmap and event.levelno not in [bb.msg.BBLogFormatter.PLAIN, bb.msg.BBLogFormatter.WARNONCE, bb.msg.BBLogFormatter.ERRORONCE]: |
665 | taskinfo = helper.running_tasks[helper.pidmap[event.taskpid]] | 665 | taskinfo = helper.running_tasks[helper.pidmap[event.taskpid]] |
666 | event.msg = taskinfo['title'] + ': ' + event.msg | 666 | event.msg = taskinfo['title'] + ': ' + event.msg |
667 | if hasattr(event, 'fn'): | 667 | if hasattr(event, 'fn') and event.levelno not in [bb.msg.BBLogFormatter.WARNONCE, bb.msg.BBLogFormatter.ERRORONCE]: |
668 | event.msg = event.fn + ': ' + event.msg | 668 | event.msg = event.fn + ': ' + event.msg |
669 | logging.getLogger(event.name).handle(event) | 669 | logging.getLogger(event.name).handle(event) |
670 | continue | 670 | continue |
@@ -875,11 +875,11 @@ def main(server, eventHandler, params, tf = TerminalFilter): | |||
875 | for failure in taskfailures: | 875 | for failure in taskfailures: |
876 | summary += "\n %s" % failure | 876 | summary += "\n %s" % failure |
877 | if warnings: | 877 | if warnings: |
878 | summary += pluralise("\nSummary: There was %s WARNING message shown.", | 878 | summary += pluralise("\nSummary: There was %s WARNING message.", |
879 | "\nSummary: There were %s WARNING messages shown.", warnings) | 879 | "\nSummary: There were %s WARNING messages.", warnings) |
880 | if return_value and errors: | 880 | if return_value and errors: |
881 | summary += pluralise("\nSummary: There was %s ERROR message shown, returning a non-zero exit code.", | 881 | summary += pluralise("\nSummary: There was %s ERROR message, returning a non-zero exit code.", |
882 | "\nSummary: There were %s ERROR messages shown, returning a non-zero exit code.", errors) | 882 | "\nSummary: There were %s ERROR messages, returning a non-zero exit code.", errors) |
883 | if summary and params.options.quiet == 0: | 883 | if summary and params.options.quiet == 0: |
884 | print(summary) | 884 | print(summary) |
885 | 885 | ||