diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-28 11:06:18 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-30 10:10:36 +0100 |
commit | f80334d8aa680c249d84df9109ceca9e7a479cdd (patch) | |
tree | e1e713fd984ff8d84863820b17088c803e9b2e70 /bitbake/lib/bb/cooker.py | |
parent | dd275f46f8586e408655eac899e01d14b56e0919 (diff) | |
download | poky-f80334d8aa680c249d84df9109ceca9e7a479cdd.tar.gz |
bitbake: cooker: Only change self.data if it exists
With the change to more optimal default featureset behaviour, a race was
exposed by hob where the code may try and change self.data before it
exists. This change avoids that.
When the datastore is created, the cooker configuration is used so
data tracking is correctly handled regardless.
(Bitbake rev: 9d8f7efbc39d64124936ccaeb3c47a112e595d78)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index e81d887268..5d3ac607f5 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -207,11 +207,13 @@ class BBCooker: | |||
207 | 207 | ||
208 | def enableDataTracking(self): | 208 | def enableDataTracking(self): |
209 | self.configuration.tracking = True | 209 | self.configuration.tracking = True |
210 | self.data.enableTracking() | 210 | if hasattr(self, "data"): |
211 | self.data.enableTracking() | ||
211 | 212 | ||
212 | def disableDataTracking(self): | 213 | def disableDataTracking(self): |
213 | self.configuration.tracking = False | 214 | self.configuration.tracking = False |
214 | self.data.disableTracking() | 215 | if hasattr(self, "data"): |
216 | self.data.disableTracking() | ||
215 | 217 | ||
216 | def modifyConfigurationVar(self, var, val, default_file, op): | 218 | def modifyConfigurationVar(self, var, val, default_file, op): |
217 | if op == "append": | 219 | if op == "append": |