diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-27 18:54:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:27:22 +0000 |
commit | ce0ecf5d847b168ad05117cdd1f5fdcc561d770d (patch) | |
tree | 994a7639091021cff978e90c74e2db6cb8b27e81 /bitbake/lib/bb/ui | |
parent | e7952c188374508bcf65903d85ae27a593de7465 (diff) | |
download | poky-ce0ecf5d847b168ad05117cdd1f5fdcc561d770d.tar.gz |
bitbake: fix setscene task start/failure handling
* When a setscene task starts, print out that it's starting in the UI
(ensuring we get the correct task name)
* When a setscene task fails, ensure we remove it from the list of
running tasks so that if you break out any time afterwards it
is not still listed.
(Bitbake rev: e8a3499c95a6d4f2b8fed002fb9504733c5be3c6)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 9 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/uihelper.py | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index e2e6ac3d65..14989d47d9 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -238,6 +238,10 @@ def main(server, eventHandler): | |||
238 | logger.error("%s", reason) | 238 | logger.error("%s", reason) |
239 | continue | 239 | continue |
240 | 240 | ||
241 | if isinstance(event, bb.runqueue.sceneQueueTaskStarted): | ||
242 | logger.info("Running setscene task %d of %d (%s)" % (event.stats.completed + event.stats.active + event.stats.failed + 1, event.stats.total, event.taskstring)) | ||
243 | continue | ||
244 | |||
241 | if isinstance(event, bb.runqueue.runQueueTaskStarted): | 245 | if isinstance(event, bb.runqueue.runQueueTaskStarted): |
242 | if event.noexec: | 246 | if event.noexec: |
243 | tasktype = 'noexec task' | 247 | tasktype = 'noexec task' |
@@ -256,6 +260,11 @@ def main(server, eventHandler): | |||
256 | event.taskid, event.taskstring, event.exitcode) | 260 | event.taskid, event.taskstring, event.exitcode) |
257 | continue | 261 | continue |
258 | 262 | ||
263 | if isinstance(event, bb.runqueue.sceneQueueTaskFailed): | ||
264 | logger.warn("Setscene task %s (%s) failed with exit code '%s' - real task will be run instead", | ||
265 | event.taskid, event.taskstring, event.exitcode) | ||
266 | continue | ||
267 | |||
259 | # ignore | 268 | # ignore |
260 | if isinstance(event, (bb.event.BuildBase, | 269 | if isinstance(event, (bb.event.BuildBase, |
261 | bb.event.StampUpdate, | 270 | bb.event.StampUpdate, |
diff --git a/bitbake/lib/bb/ui/uihelper.py b/bitbake/lib/bb/ui/uihelper.py index bbf5135b70..4116dabf94 100644 --- a/bitbake/lib/bb/ui/uihelper.py +++ b/bitbake/lib/bb/ui/uihelper.py | |||
@@ -32,9 +32,8 @@ class BBUIHelper: | |||
32 | if isinstance(event, bb.build.TaskSucceeded): | 32 | if isinstance(event, bb.build.TaskSucceeded): |
33 | del self.running_tasks[event.pid] | 33 | del self.running_tasks[event.pid] |
34 | self.needUpdate = True | 34 | self.needUpdate = True |
35 | if isinstance(event, bb.build.TaskFailed): | 35 | if isinstance(event, bb.build.TaskFailed) or isinstance(event, bb.build.TaskFailedSilent): |
36 | del self.running_tasks[event.pid] | 36 | del self.running_tasks[event.pid] |
37 | self.failed_tasks.append( { 'title' : "%s %s" % (event._package, event._task)}) | ||
38 | self.needUpdate = True | 37 | self.needUpdate = True |
39 | 38 | ||
40 | def getTasks(self): | 39 | def getTasks(self): |