From 9fcf0c333456b2e355cef478d2c5fa6e81c6acc4 Mon Sep 17 00:00:00 2001 From: Irina Patru Date: Tue, 21 Jan 2014 17:59:35 +0200 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index b12f2d8..a3bd264 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, -- 2.7.4