From c8286e049f911605f61733dc8fce3a7e331d7e9c Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 22 Feb 2012 21:24:41 +0000 Subject: bitbake/ui/knotty: fix incorrect exit code The recent Ctrl+C patch was not fully tested; the variable it was relying upon is set to non-zero under other circumstances and thus bitbake was reporting that it was interrupted and returning a non-zero exit code when it was not. Track this status in a separate variable in order to fix the issue. (Bitbake rev: 95a599067650902727ecb4a39d6dd003c5cfedf3) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/knotty.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 9881d828d1..158a132726 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py @@ -110,6 +110,7 @@ def main(server, eventHandler): parseprogress = None cacheprogress = None shutdown = 0 + interrupted = False return_value = 0 errors = 0 warnings = 0 @@ -276,6 +277,7 @@ def main(server, eventHandler): print("\nSecond Keyboard Interrupt, stopping...\n") server.runCommand(["stateStop"]) if shutdown == 0: + interrupted = True print("\nKeyboard Interrupt, closing down...\n") server.runCommand(["stateShutdown"]) shutdown = shutdown + 1 @@ -296,7 +298,7 @@ def main(server, eventHandler): if summary: print(summary) - if shutdown: + if interrupted: print("Execution was interrupted, returning a non-zero exit code.") if return_value == 0: return_value = 1 -- cgit v1.2.3-54-g00ecf