From 1cce7f885cf143370c989381ae8c8f4833e7cbd6 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 7 Aug 2017 12:03:44 +0200 Subject: devtool: fix handling of errors during task execution * 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. (From OE-Core rev: 65e644368fc9c294af96906528ee0cf30305e0a6) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'scripts/lib/devtool/standard.py') 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): 'logging.LogRecord', 'bb.command.CommandCompleted', 'bb.command.CommandFailed', + 'bb.cooker.CookerExit', 'bb.build.TaskStarted', 'bb.build.TaskSucceeded', 'bb.build.TaskFailed', 'bb.build.TaskFailedSilent']) 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): break + 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: continue + if event.levelno >= logging.ERROR: + error = True logger.handle(event) + 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) -- cgit v1.2.3-54-g00ecf