|
@@ -2034,6 +2034,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
|
|
|
|
|
|
taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
|
|
|
taskhash = self.rqdata.get_task_hash(task)
|
|
|
+ unihash = self.rqdata.get_task_unihash(task)
|
|
|
if 'fakeroot' in taskdep and taskname in taskdep['fakeroot'] and not (self.cooker.configuration.dry_run or self.rqdata.setscene_enforce):
|
|
|
if not mc in self.rq.fakeworker:
|
|
|
try:
|
|
@@ -2043,10 +2044,10 @@ class RunQueueExecuteTasks(RunQueueExecute):
|
|
|
self.rq.state = runQueueFailed
|
|
|
self.stats.taskFailed()
|
|
|
return True
|
|
|
- self.rq.fakeworker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, taskhash, False, self.cooker.collection.get_file_appends(taskfn), taskdepdata, self.rqdata.setscene_enforce)) + b"</runtask>")
|
|
|
+ self.rq.fakeworker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, taskhash, unihash, False, self.cooker.collection.get_file_appends(taskfn), taskdepdata, self.rqdata.setscene_enforce)) + b"</runtask>")
|
|
|
self.rq.fakeworker[mc].process.stdin.flush()
|
|
|
else:
|
|
|
- self.rq.worker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, taskhash, False, self.cooker.collection.get_file_appends(taskfn), taskdepdata, self.rqdata.setscene_enforce)) + b"</runtask>")
|
|
|
+ self.rq.worker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, taskhash, unihash, False, self.cooker.collection.get_file_appends(taskfn), taskdepdata, self.rqdata.setscene_enforce)) + b"</runtask>")
|
|
|
self.rq.worker[mc].process.stdin.flush()
|
|
|
|
|
|
self.build_stamps[task] = bb.build.stampfile(taskname, self.rqdata.dataCaches[mc], taskfn, noextra=True)
|
|
@@ -2462,13 +2463,14 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
|
|
|
|
|
|
taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
|
|
|
taskhash = self.rqdata.get_task_hash(task)
|
|
|
+ unihash = self.rqdata.get_task_unihash(task)
|
|
|
if 'fakeroot' in taskdep and taskname in taskdep['fakeroot'] and not self.cooker.configuration.dry_run:
|
|
|
if not mc in self.rq.fakeworker:
|
|
|
self.rq.start_fakeworker(self, mc)
|
|
|
- self.rq.fakeworker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, taskhash, True, self.cooker.collection.get_file_appends(taskfn), taskdepdata, False)) + b"</runtask>")
|
|
|
+ self.rq.fakeworker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, taskhash, unihash, True, self.cooker.collection.get_file_appends(taskfn), taskdepdata, False)) + b"</runtask>")
|
|
|
self.rq.fakeworker[mc].process.stdin.flush()
|
|
|
else:
|
|
|
- self.rq.worker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, taskhash, True, self.cooker.collection.get_file_appends(taskfn), taskdepdata, False)) + b"</runtask>")
|
|
|
+ self.rq.worker[mc].process.stdin.write(b"<runtask>" + pickle.dumps((taskfn, task, taskname, taskhash, unihash, True, self.cooker.collection.get_file_appends(taskfn), taskdepdata, False)) + b"</runtask>")
|
|
|
self.rq.worker[mc].process.stdin.flush()
|
|
|
|
|
|
self.build_stamps[task] = bb.build.stampfile(taskname, self.rqdata.dataCaches[mc], taskfn, noextra=True)
|