From 3f16624485e44bf4b261be4aa506dd8c7fc8a6cc Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Fri, 21 Feb 2014 11:59:38 +0000 Subject: [PATCH] bitbake: toasterui: fix status update on failed sstate tasks This patch fixes a logical error when updating task information based on the corresponding sstate task state. (Bitbake rev: 777458a20a7f686881e525a4d81b286c486ead6a) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/buildinfohelper.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 846465c971..f221daca5a 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py @@ -110,9 +110,12 @@ class ORMWrapper(object): for v in vars(task_object): if v in task_information.keys(): vars(task_object)[v] = task_information[v] - # if we got covered by a setscene task, we're CACHED - if task_object.outcome == Task.OUTCOME_COVERED and 1 == Task.objects.related_setscene(task_object).count(): - task_object.outcome = Task.OUTCOME_CACHED + + # update setscene-related information + if 1 == Task.objects.related_setscene(task_object).count(): + if task_object.outcome == Task.OUTCOME_COVERED: + task_object.outcome = Task.OUTCOME_CACHED + outcome_task_setscene = Task.objects.get(task_executed=True, build = task_object.build, recipe = task_object.recipe, task_name=task_object.task_name+"_setscene").outcome if outcome_task_setscene == Task.OUTCOME_SUCCESS: