summaryrefslogtreecommitdiffstats
path: root/bitbake/bin/bitbake-worker
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-22 13:31:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-02 13:08:47 +0000
commitfaef2d9588821077b289e06021da76fa6da53d9a (patch)
treed22773bc30e13262da8d27638e05d0fdefaa3768 /bitbake/bin/bitbake-worker
parent3cf2d232529c4fd6b58f87ddbf3df9d805e4180f (diff)
downloadpoky-faef2d9588821077b289e06021da76fa6da53d9a.tar.gz
bitbake: runqueue/bitbake-worker: Fix dry run fakeroot issues
When using the dry run option (-n), bitbake would still try and fire a specific fakeroot worker. This is doomed to failure since it might well not have been built. Add in some checks to prevent the failures. [YOCTO #5367] (Bitbake rev: 78ae96e667d3fbb8649fe25eb073e15a99d61cc8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin/bitbake-worker')
-rwxr-xr-xbitbake/bin/bitbake-worker3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index 66b6aabfdb..ff20c1ca98 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -97,7 +97,8 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, quieterror
97 except TypeError: 97 except TypeError:
98 umask = taskdep['umask'][taskname] 98 umask = taskdep['umask'][taskname]
99 99
100 if 'fakeroot' in taskdep and taskname in taskdep['fakeroot']: 100 # We can't use the fakeroot environment in a dry run as it possibly hasn't been built
101 if 'fakeroot' in taskdep and taskname in taskdep['fakeroot'] and not cfg.dry_run:
101 envvars = (workerdata["fakerootenv"][fn] or "").split() 102 envvars = (workerdata["fakerootenv"][fn] or "").split()
102 for key, value in (var.split('=') for var in envvars): 103 for key, value in (var.split('=') for var in envvars):
103 envbackup[key] = os.environ.get(key) 104 envbackup[key] = os.environ.get(key)