From fe715c4d1b376b08dda36ac017c3f392fcc55870 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 24 May 2013 12:54:59 +0000 Subject: bitbake: cooker/cookerdata: Fix up event handling for hob The init function call was clobbering data hob relies on injecting, fix this so the data injected by hob isn't overwritten. (Bitbake rev: 64ca1aa1fd5f0473196b6cd805637fa644a92173) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index cd9cccdfce..2ae3e9d239 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -129,6 +129,7 @@ class BBCooker: sys.exit("FATAL: Failed to import extra cache class '%s'." % cache_name) self.configuration.data = None + self.initConfigurationData() self.loadConfigurationData() # Take a lock so only one copy of bitbake can run against a given build @@ -175,7 +176,6 @@ class BBCooker: self.configuration.data.disableTracking() def loadConfigurationData(self): - self.initConfigurationData() self.databuilder.parseBaseConfiguration() self.configuration.data = self.databuilder.data self.configuration.data_hash = self.databuilder.data_hash @@ -1221,6 +1221,7 @@ class BBCooker: def reset(self): self.state = state.initial + self.initConfigurationData() self.loadConfigurationData() def server_main(cooker, func, *args): -- cgit v1.2.3-54-g00ecf