summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
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/lib
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/lib')
-rw-r--r--bitbake/lib/bb/runqueue.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 72c020801b..a320a649e9 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1408,7 +1408,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
1408 bb.event.fire(startevent, self.cfgData) 1408 bb.event.fire(startevent, self.cfgData)
1409 1409
1410 taskdep = self.rqdata.dataCache.task_deps[fn] 1410 taskdep = self.rqdata.dataCache.task_deps[fn]
1411 if 'fakeroot' in taskdep and taskname in taskdep['fakeroot']: 1411 if 'fakeroot' in taskdep and taskname in taskdep['fakeroot'] and not self.cooker.configuration.dry_run:
1412 if not self.rq.fakeworker: 1412 if not self.rq.fakeworker:
1413 self.rq.start_fakeworker(self) 1413 self.rq.start_fakeworker(self)
1414 self.rq.fakeworker.stdin.write("<runtask>" + pickle.dumps((fn, task, taskname, False, self.cooker.collection.get_file_appends(fn))) + "</runtask>") 1414 self.rq.fakeworker.stdin.write("<runtask>" + pickle.dumps((fn, task, taskname, False, self.cooker.collection.get_file_appends(fn))) + "</runtask>")