diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-09-19 11:25:42 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-20 11:48:01 +0100 |
| commit | 5bab81b124087d63d6eb62a861e1241714fcd483 (patch) | |
| tree | 89b818a503fcd8752ab323862f4d297a6efb56ff /lib | |
| parent | 6d56bec4464da14d7fde0e60946be43293ad6e52 (diff) | |
| download | bitbake-5bab81b124087d63d6eb62a861e1241714fcd483.tar.gz | |
hob: report event handler failures
If an event handler failed we were not recieving an error message -
parsing just "froze" at 99%. This is because we were expecting a
CommandFailure event and this never happened in the case of
RequestPackageInfo which is where the failure was occurring.
This also required tweaking the error formatting slightly, taking the
return value of the format function rather than the message property
since the latter only seems to contain the first line without the
traceback in the case of event handler failure. Other error cases were
tested and their message formatting is unaffected by this change.
Final part of the fix for [YOCTO #2651].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/ui/crumbs/hobeventhandler.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/lib/bb/ui/crumbs/hobeventhandler.py b/lib/bb/ui/crumbs/hobeventhandler.py index 35cbded97..8fc1732a8 100644 --- a/lib/bb/ui/crumbs/hobeventhandler.py +++ b/lib/bb/ui/crumbs/hobeventhandler.py @@ -156,6 +156,13 @@ class HobHandler(gobject.GObject): targets.append(self.toolchain) self.runCommand(["buildTargets", targets, self.default_task]) + def display_error(self): + self.clear_busy() + self.emit("command-failed", self.error_msg) + self.error_msg = "" + if self.building: + self.building = False + def handle_event(self, event): if not event: return @@ -178,8 +185,8 @@ class HobHandler(gobject.GObject): elif isinstance(event, logging.LogRecord): if event.levelno >= logging.ERROR: formatter = bb.msg.BBLogFormatter() - formatter.format(event) - self.error_msg += event.message + '\n' + msg = formatter.format(event) + self.error_msg += msg + '\n' elif isinstance(event, bb.event.TargetsTreeGenerated): self.current_phase = "data generation" @@ -211,11 +218,7 @@ class HobHandler(gobject.GObject): self.run_next_command() elif isinstance(event, bb.command.CommandFailed): self.commands_async = [] - self.clear_busy() - self.emit("command-failed", self.error_msg) - self.error_msg = "" - if self.building: - self.building = False + self.display_error() elif isinstance(event, (bb.event.ParseStarted, bb.event.CacheLoadStarted, bb.event.TreeDataPreparationStarted, @@ -245,6 +248,9 @@ class HobHandler(gobject.GObject): message["title"] = "Parsing recipes: " self.emit("parsing-completed", message) + if self.error_msg and not self.commands_async: + self.display_error() + return def init_cooker(self): |