mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake/data/runqueue: Sync up with upstream to clean up environment variable handling

Browse Source 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-06-08 20:16:56 +01:00
parent bdab8e9354
commit c7f76a1bc9
2 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bitbake/lib/bb/runqueue.py
View File

@@ -1062,7 +1062,6 @@ class RunQueueExecute:
# We need to setup the environment BEFORE the fork, since
# a fork() or exec*() activates PSEUDO...
env = {}
envbackup = {}
taskdep = self.rqdata.dataCache.task_deps[fn]
@@ -1071,7 +1070,6 @@ class RunQueueExecute:
for key, value in (var.split('=') for var in envvars):
envbackup[key] = os.environ.get(key)
os.environ[key] = value
env[key] = value
fakedirs = (self.rqdata.dataCache.fakerootdirs[fn] or "").split()
for p in fakedirs:
@@ -1118,14 +1116,7 @@ class RunQueueExecute:
for h in self.rqdata.hash_deps:
the_data.setVar("BBHASHDEPS_%s" % h, self.rqdata.hash_deps[h])
env2 = bb.data.export_vars(the_data)
env2 = bb.data.export_envvars(env2, the_data)
for e in os.environ:
os.unsetenv(e)
for e in env2:
os.putenv(e, env2[e])
for e in env:
os.putenv(e, env[e])
os.environ.update(bb.data.exported_vars(the_data))
if quieterrors:
the_data.setVarFlag(taskname, "quieterrors", "1")