summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-13 17:34:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-14 08:20:38 +0100
commit926b60f6e4b95ea6c9f108034e0ad03bc7f9ff14 (patch)
treed8da5d9b78eac29047db4cd7c81b0d6ab23b1246
parentef7e3882a9fd173a22d3c378d91306cb609537d0 (diff)
downloadpoky-926b60f6e4b95ea6c9f108034e0ad03bc7f9ff14.tar.gz
bitbake: knotty: Cleanup error/interruption handling
Only display a CommandFailed ERROR: message if there is an error to display. Only display an errors summary if we actually displayed errors. (Bitbake rev: 568ea00acd226d48e725bb01d4f8c410ed1eaa61) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/knotty.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index f706b9759d..35590a2a79 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -405,8 +405,9 @@ def main(server, eventHandler, params, tf = TerminalFilter):
405 405
406 if isinstance(event, bb.command.CommandFailed): 406 if isinstance(event, bb.command.CommandFailed):
407 return_value = event.exitcode 407 return_value = event.exitcode
408 errors = errors + 1 408 if event.error:
409 logger.error("Command execution failed: %s", event.error) 409 errors = errors + 1
410 logger.error("Command execution failed: %s", event.error)
410 main.shutdown = 2 411 main.shutdown = 2
411 continue 412 continue
412 if isinstance(event, bb.command.CommandExit): 413 if isinstance(event, bb.command.CommandExit):
@@ -520,7 +521,7 @@ def main(server, eventHandler, params, tf = TerminalFilter):
520 if warnings: 521 if warnings:
521 summary += pluralise("\nSummary: There was %s WARNING message shown.", 522 summary += pluralise("\nSummary: There was %s WARNING message shown.",
522 "\nSummary: There were %s WARNING messages shown.", warnings) 523 "\nSummary: There were %s WARNING messages shown.", warnings)
523 if return_value: 524 if return_value and errors:
524 summary += pluralise("\nSummary: There was %s ERROR message shown, returning a non-zero exit code.", 525 summary += pluralise("\nSummary: There was %s ERROR message shown, returning a non-zero exit code.",
525 "\nSummary: There were %s ERROR messages shown, returning a non-zero exit code.", errors) 526 "\nSummary: There were %s ERROR messages shown, returning a non-zero exit code.", errors)
526 if summary: 527 if summary: