summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-31 08:07:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-31 08:07:49 +0100
commitd55db7b0582d17bb998a9254185702b8807bedc6 (patch)
tree3146fc4be40bbf3d850f2b2749a0b980191eea1f /bitbake/lib
parent06fc2d2ec8e72f063f2c67601b2f027f76971e05 (diff)
downloadpoky-d55db7b0582d17bb998a9254185702b8807bedc6.tar.gz
bitbake/cooker.py: Bring into sync with upstream bitbake (trivial difference)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/cooker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 75c77b7112..dea0aadbee 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -178,7 +178,7 @@ class BBCooker:
178 self.configuration.data = bb.data.init() 178 self.configuration.data = bb.data.init()
179 179
180 if not self.server_registration_cb: 180 if not self.server_registration_cb:
181 bb.data.setVar("BB_WORKERCONTEXT", "1", self.configuration.data) 181 self.configuration.data.setVar("BB_WORKERCONTEXT", "1")
182 182
183 filtered_keys = bb.utils.approved_variables() 183 filtered_keys = bb.utils.approved_variables()
184 bb.data.inheritFromOS(self.configuration.data, self.savedenv, filtered_keys) 184 bb.data.inheritFromOS(self.configuration.data, self.savedenv, filtered_keys)