From 6d76379af89aafb3757d60bc67b96c6f65ca8455 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 14 Jul 2011 15:43:27 -0700 Subject: ui/crumbs/hobeventhandler: reparse files before running other commands Integrate reparseFiles into the run_next_command() method rather than calling reparseFiles on the server and immediately calling other methods. (Bitbake rev: 20f7218992cfe18f1d3dcea53f2e5a7bf96346db) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index 78a50901d5..d10c8588dc 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py @@ -61,7 +61,7 @@ class HobHandler(gobject.GObject): gobject.TYPE_STRING)), } - (CFG_PATH_LOCAL, CFG_PATH_HOB, CFG_PATH_LAYERS, CFG_FILES_DISTRO, CFG_FILES_MACH, CFG_FILES_SDK, FILES_MATCH_CLASS, GENERATE_TGTS) = range(8) + (CFG_PATH_LOCAL, CFG_PATH_HOB, CFG_PATH_LAYERS, CFG_FILES_DISTRO, CFG_FILES_MACH, CFG_FILES_SDK, FILES_MATCH_CLASS, GENERATE_TGTS, REPARSE_FILES) = range(9) def __init__(self, taskmodel, server): gobject.GObject.__init__(self) @@ -110,6 +110,9 @@ class HobHandler(gobject.GObject): self.emit("data-generated") self.generating = False self.current_command = None + elif self.current_command == self.REPARSE_FILES: + self.current_command = self.CFG_PATH_LAYERS + self.server.runCommand(["reparseFiles"]) def handle_event(self, event, running_build, pbar): if not event: @@ -195,8 +198,7 @@ class HobHandler(gobject.GObject): img = self.model.selected_image selected_packages, _ = self.model.get_selected_packages() self.emit("reload-triggered", img, " ".join(selected_packages)) - self.server.runCommand(["reparseFiles"]) - self.current_command = self.CFG_PATH_LAYERS + self.current_command = self.REPARSE_FILES self.run_next_command() def set_bbthreads(self, threads): -- cgit v1.2.3-54-g00ecf