Skip to contentSkip to conversation

fix incorrect exit code

PATCH Applied Paul Eggleton 2 participants 3 messages Feb 22, 2012

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover fix incorrect exit code

Fixes a moderately serious regression caused by my recently merged Ctrl+C patch.

The patch (against poky, but applies cleanly against bitbake master with -p2) is available in the git repository at:
git://git.yoctoproject.org/poky-contrib paule/bitbake-shutdown-fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/bitbake-shutdown-fix

Paul Eggleton (1):
bitbake/ui/knotty: fix incorrect exit code

 bitbake/lib/bb/ui/knotty.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/1 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.

Signed-off-by Paul Eggleton <[email protected]>
---
 bitbake/lib/bb/ui/knotty.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
bitbake/lib/bb/ui/knotty.py +3 -1
index 9881d82..158a132 100644
@@ -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
Signature · 1 line
1.7.5.4
Applied
#2 lore raw
In reply to Paul Eggleton
Quoted 10 lines · Paul Eggleton

Fixes a moderately serious regression caused by my recently merged Ctrl+C patch.

The patch (against poky, but applies cleanly against bitbake master with -p2) is available in the git repository at:
git://git.yoctoproject.org/poky-contrib paule/bitbake-shutdown-fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/bitbake-shutdown-fix

Paul Eggleton (1):
bitbake/ui/knotty: fix incorrect exit code

Merged to master, thanks.

Richard