aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrina Patru <irina.patru@intel.com>2014-01-21 17:59:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-28 00:52:56 +0000
commitf43c2d8d791cebfa7acdfa3bd8f4f722b607386e (patch)
treed28d5c833661872689c764a085e3c2a9dd7357fa
parent3c5b68356ddd3440375fd0f70b98b476042f2502 (diff)
downloadopenembedded-core-contrib-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>
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py7
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):
self.server = server
self.error_msg = ""
- self.lastCommand = ""
self.initcmd = None
self.parsing = False
@@ -113,7 +112,6 @@ class HobHandler(gobject.GObject):
self.generating = False
def runCommand(self, commandline):
- self.lastCommand = commandline[0]
try:
result, error = self.server.runCommand(commandline)
if error:
@@ -252,10 +250,7 @@ class HobHandler(gobject.GObject):
self.current_phase = None
self.run_next_command()
elif isinstance(event, bb.command.CommandFailed):
- if self.error_msg == "":
- self.error_msg = "The command \"" + self.lastCommand
- self.error_msg += "\" was sent to bitbake server but it failed. Please"
- self.error_msg += " check the code executed by this command in bitbake."
+ self.error_msg += event.error
self.commands_async = []
self.display_error()
elif isinstance(event, (bb.event.ParseStarted,