diff options
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-02 16:33:04 +0200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-07 12:01:10 +0200
commitc402f25ed2151e87e201ffcb1b8a9b0fc1550a1c (patch)
parent9476ad81324bf304b26d2e9bbe469bd7e3751192 (diff)
devtool: fix handling of errors during task executionpaule/server-fixes
* If an error is logged while executing a task, we need to ensure we exit instead of assuming everything went OK. * If we receive CookerExit, the server is shutting down and we need to stop waiting for events and probably exit (knotty does this). This will occur if an exception or bb.fatal() happens during an event handler. This fixes a couple of issues highlighted when using devtool upgrade or modify on a non-supported recipe with intel-iot-refkit together with bitbake master, but I'd be very surprised if it were hard to reproduce in other scenarios. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 22a9ec82c9..ec192238ed 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -498,18 +498,24 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d, tinfoil):
+ 'bb.cooker.CookerExit',
def runtask(target, task):
+ error = False
if tinfoil.build_file(target, task):
while True:
event = tinfoil.wait_event(0.25)
if event:
if isinstance(event, bb.command.CommandCompleted):
+ elif isinstance(event, bb.cooker.CookerExit):
+ # The server is going away, so drop the connection
+ tinfoil.server_connection = None
+ break
elif isinstance(event, bb.command.CommandFailed):
raise DevtoolError('Task do_%s failed: %s' % (task, event.error))
elif isinstance(event, bb.build.TaskFailed):
@@ -519,7 +525,11 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d, tinfoil):
elif isinstance(event, logging.LogRecord):
if event.levelno <= logging.INFO:
+ if event.levelno >= logging.ERROR:
+ error = True
+ if error:
+ raise DevtoolError('An error occurred during do_%s, exiting' % task)
# we need virtual:native:/path/to/recipe if it's a BBCLASSEXTEND
fn = tinfoil.get_recipe_file(pn)