summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-09-10 11:14:54 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-04 14:46:35 +0000
commit7afe34e2c22904024f7082d3cf0f42550a10d83e (patch)
treeca65c9fc86f8c517f6048606e9aade79b4695388
parent7011ae3f789fca3fcaf7af9d16d0aa50a20c03b4 (diff)
downloadopenembedded-core-7afe34e2c22904024f7082d3cf0f42550a10d83e.tar.gz
openembedded-core-7afe34e2c22904024f7082d3cf0f42550a10d83e.tar.bz2
openembedded-core-7afe34e2c22904024f7082d3cf0f42550a10d83e.tar.xz
openembedded-core-7afe34e2c22904024f7082d3cf0f42550a10d83e.zip
Fix exit code display for task failure
Per the python documentation, os.waitpid returns the exitcode shifted up by 8 bits, and we weren't compensating, resulting in a display of 'failed with 256' when a worker process exits with a code of 1. (Bitbake rev: 90c2b6cb24dc9c82f0a9aa9d23f2d1ed2e6ff301) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake/lib/bb/runqueue.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 6ea022e42..2b81540a1 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1054,7 +1054,7 @@ class RunQueueExecute:
self.build_pipes[result[0]].close()
del self.build_pipes[result[0]]
if result[1] != 0:
- self.task_fail(task, result[1])
+ self.task_fail(task, result[1]>>8)
else:
self.task_complete(task)
@@ -1259,7 +1259,9 @@ class RunQueueExecuteTasks(RunQueueExecute):
Called when a task has failed
Updates the state engine with the failure
"""
- logger.error("Task %s (%s) failed with %s" % (task, self.rqdata.get_user_idstring(task), exitcode))
+ logger.error("Task %s (%s) failed with exit code '%s'", task,
+ self.rqdata.get_user_idstring(task), exitcode)
+
self.stats.taskFailed()
fnid = self.rqdata.runq_fnid[task]
self.failed_fnids.append(fnid)