summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-06-13 17:46:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 14:54:24 +0100
commit68847d9ab5474ee47a4f9f67af0a31c18d91c48d (patch)
tree93312151c366a0f78dc4df7cbc864bcbe42fe510
parent06e9b44f97a4ba5552d2b2ad1d10acd1871ac1ce (diff)
downloadpoky-68847d9ab5474ee47a4f9f67af0a31c18d91c48d.tar.gz
bitbake: bitbake: runqueue: multiconfig fix
Differentiate between fn and taskfn in "execute". This was somehow missed in "fakeroot" handling. (Bitbake rev: d848bff7cf78f63986467b51f701a998a480eb25) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 7d2ff818eb..21520d3d6a 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1932,7 +1932,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
1932 self.rq.state = runQueueFailed 1932 self.rq.state = runQueueFailed
1933 self.stats.taskFailed() 1933 self.stats.taskFailed()
1934 return True 1934 return True
1935 self.rq.fakeworker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, False, self.cooker.collection.get_file_appends(fn), taskdepdata, self.rqdata.setscene_enforce)) + b"</runtask>") 1935 self.rq.fakeworker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, False, self.cooker.collection.get_file_appends(taskfn), taskdepdata, self.rqdata.setscene_enforce)) + b"</runtask>")
1936 self.rq.fakeworker[mc].process.stdin.flush() 1936 self.rq.fakeworker[mc].process.stdin.flush()
1937 else: 1937 else:
1938 self.rq.worker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, False, self.cooker.collection.get_file_appends(taskfn), taskdepdata, self.rqdata.setscene_enforce)) + b"</runtask>") 1938 self.rq.worker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, False, self.cooker.collection.get_file_appends(taskfn), taskdepdata, self.rqdata.setscene_enforce)) + b"</runtask>")