sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: bb.runqueue: fix unexpected process death logic 

`if w in self.rq.worker` when w *is* self.rq.worker doesn't make a great deal
of sense, and results in this error:

      File ".../poky/bitbake/lib/bb/runqueue.py", line 2372, in runQueuePipe.read():
                             name = None
        >                    if w in self.rq.worker:
                                 name = "Worker"
    TypeError: unhashable type: 'dict'

Most likely this was meant to be 'is' rather than 'in', but rather than
checking after the fact, just include the name in the iteration, instead.

While we're here, also clean up and fix the broken error message.

(Bitbake rev: 267e025cad44c8bd0fb157f1f7a2e08df117ba84)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Christopher Larson 2016-10-06 21:07:41 -07:00 committed by Richard Purdie
parent 31aafe6852
commit f4366293ff
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2365,16 +2365,11 @@ class runQueuePipe():
self.rqexec = rqexec
def read(self):
for w in [self.rq.worker, self.rq.fakeworker]:
for mc in w:
w[mc].process.poll()
if w[mc].process.returncode is not None and not self.rq.teardown:
name = None
if w in self.rq.worker:
name = "Worker"
elif w in self.rq.fakeworker:
name = "Fakeroot"
bb.error("%s process (%s) exited unexpectedly (%s), shutting down..." % (name, w.pid, str(w.returncode)))
for workers, name in [(self.rq.worker, "Worker"), (self.rq.fakeworker, "Fakeroot")]:
for worker in workers.values():
worker.process.poll()
if worker.process.returncode is not None and not self.rq.teardown:
bb.error("%s process (%s) exited unexpectedly (%s), shutting down..." % (name, worker.process.pid, str(worker.process.returncode)))
self.rq.finish_runqueue(True)
start = len(self.queue)