From 860cba85cfb3047c8a2c9b3127a9b3f4441fd1a6 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 6 Apr 2016 17:46:48 +0100 Subject: bitbake: toasterui: update build in internal state buildinfohelper stores current Build object in its internal state. Any changes to Build object will be lost if internal state is not updated as current buildinfohelper code saves Build object from internal state when build is completed. This bug causes incorrect build state when build is cancelled. Updating internal state should fix it. Note, that this commit updates internal state after status of the build is changed to Build.CANCELLED. There are several other places in the code where Build object is updated without updating internal state. They should be carefully analyzed and fixed. (Bitbake rev: d056cf40fc55530cb1736aedfb9a3c355884991e) Signed-off-by: Ed Bartosh Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/buildinfohelper.py | 1 + 1 file changed, 1 insertion(+) (limited to 'bitbake') diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 9cb2c54067..1473a67222 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py @@ -1420,6 +1420,7 @@ class BuildInfoHelper(object): logger.info("Build cancelled") br.build.outcome = Build.CANCELLED br.build.save() + self.internal_state['build'] = br.build errorcode = 0 if errorcode == 0: -- cgit v1.2.3-54-g00ecf