diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/cookerdata.py | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index e27763ecab..daffe67540 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -1566,6 +1566,8 @@ class BBCooker: | |||
1566 | def clientComplete(self): | 1566 | def clientComplete(self): |
1567 | """Called when the client is done using the server""" | 1567 | """Called when the client is done using the server""" |
1568 | self.finishcommand() | 1568 | self.finishcommand() |
1569 | self.databuilder.reset() | ||
1570 | self.data = self.databuilder.data | ||
1569 | 1571 | ||
1570 | def server_main(cooker, func, *args): | 1572 | def server_main(cooker, func, *args): |
1571 | cooker.pre_serve() | 1573 | cooker.pre_serve() |
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index d05abfe745..55c6ea83cb 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py | |||
@@ -328,6 +328,15 @@ class CookerDataBuilder(object): | |||
328 | logger.exception("Error parsing configuration files") | 328 | logger.exception("Error parsing configuration files") |
329 | raise bb.BBHandledException | 329 | raise bb.BBHandledException |
330 | 330 | ||
331 | # Create a copy so we can reset at a later date when UIs disconnect | ||
332 | self.origdata = self.data | ||
333 | self.data = bb.data.createCopy(self.origdata) | ||
334 | self.mcdata[''] = self.data | ||
335 | |||
336 | def reset(self): | ||
337 | self.data = bb.data.createCopy(self.origdata) | ||
338 | self.mcdata[''] = self.data | ||
339 | |||
331 | def _findLayerConf(self, data): | 340 | def _findLayerConf(self, data): |
332 | return findConfigFile("bblayers.conf", data) | 341 | return findConfigFile("bblayers.conf", data) |
333 | 342 | ||