diff options
author | Irina Patru <irina.patru@intel.com> | 2014-01-21 17:59:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 00:52:56 +0000 |
commit | f43c2d8d791cebfa7acdfa3bd8f4f722b607386e (patch) | |
tree | d28d5c833661872689c764a085e3c2a9dd7357fa /bitbake/lib/bb/ui/crumbs | |
parent | 3c5b68356ddd3440375fd0f70b98b476042f2502 (diff) | |
download | poky-f43c2d8d791cebfa7acdfa3bd8f4f722b607386e.tar.gz |
bitbake: hob: change error_msg for CommandFailed event
When a bb.command.CommandFailed event is received by Hob, the error
message is stored inside event.error.
This information tells exactly why bitbake failed, so Hob should display
it instead of the current composed message.
(Bitbake rev: 24543ff6b45771712d624541ae35738d7d98f33c)
Signed-off-by: Irina Patru <irina.patru@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index b12f2d861c..a3bd264fa4 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |||
@@ -98,7 +98,6 @@ class HobHandler(gobject.GObject): | |||
98 | 98 | ||
99 | self.server = server | 99 | self.server = server |
100 | self.error_msg = "" | 100 | self.error_msg = "" |
101 | self.lastCommand = "" | ||
102 | self.initcmd = None | 101 | self.initcmd = None |
103 | self.parsing = False | 102 | self.parsing = False |
104 | 103 | ||
@@ -113,7 +112,6 @@ class HobHandler(gobject.GObject): | |||
113 | self.generating = False | 112 | self.generating = False |
114 | 113 | ||
115 | def runCommand(self, commandline): | 114 | def runCommand(self, commandline): |
116 | self.lastCommand = commandline[0] | ||
117 | try: | 115 | try: |
118 | result, error = self.server.runCommand(commandline) | 116 | result, error = self.server.runCommand(commandline) |
119 | if error: | 117 | if error: |
@@ -252,10 +250,7 @@ class HobHandler(gobject.GObject): | |||
252 | self.current_phase = None | 250 | self.current_phase = None |
253 | self.run_next_command() | 251 | self.run_next_command() |
254 | elif isinstance(event, bb.command.CommandFailed): | 252 | elif isinstance(event, bb.command.CommandFailed): |
255 | if self.error_msg == "": | 253 | self.error_msg += event.error |
256 | self.error_msg = "The command \"" + self.lastCommand | ||
257 | self.error_msg += "\" was sent to bitbake server but it failed. Please" | ||
258 | self.error_msg += " check the code executed by this command in bitbake." | ||
259 | self.commands_async = [] | 254 | self.commands_async = [] |
260 | self.display_error() | 255 | self.display_error() |
261 | elif isinstance(event, (bb.event.ParseStarted, | 256 | elif isinstance(event, (bb.event.ParseStarted, |