From 109e1597671dfb7222672e268190aabc727960ca Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 23 Sep 2011 13:13:17 -0700 Subject: ui/crumbs/hobeventhandler: move remaining getVariable calls to init Instead of calling getVariable commands each time the BBPATH and BBFILES entries need testing cache the results as a member variable at object instantiation. Fixes [YOCTO #1521] Signed-off-by: Joshua Lock --- lib/bb/ui/crumbs/hobeventhandler.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/bb/ui/crumbs/hobeventhandler.py b/lib/bb/ui/crumbs/hobeventhandler.py index 30504e1cf..44dc4acce 100644 --- a/lib/bb/ui/crumbs/hobeventhandler.py +++ b/lib/bb/ui/crumbs/hobeventhandler.py @@ -88,6 +88,8 @@ class HobHandler(gobject.GObject): deploy_dir = self.server.runCommand(["getVariable", "DEPLOY_DIR"]) self.image_out_dir = os.path.join(deploy_dir, "images") self.image_output_types = self.server.runCommand(["getVariable", "IMAGE_FSTYPES"]).split(" ") + self.bbpath = self.server.runCommand(["getVariable", "BBPATH"]) + self.bbfiles = self.server.runCommand(["getVariable", "BBFILES"]) def run_next_command(self): if self.current_command and not self.generating: @@ -263,8 +265,7 @@ class HobHandler(gobject.GObject): self.build_queue = targets if not self.bbpath_ok: - bbpath = self.server.runCommand(["getVariable", "BBPATH"]) - if self.image_dir in bbpath.split(":"): + if self.image_dir in self.bbpath.split(":"): self.bbpath_ok = True else: nbbp = self.image_dir @@ -272,8 +273,8 @@ class HobHandler(gobject.GObject): if not self.bbfiles_ok: import re pattern = "%s/\*.bb" % self.image_dir - bbfiles = self.server.runCommand(["getVariable", "BBFILES"]).split(" ") - for files in bbfiles: + + for files in self.bbfiles.split(" "): if re.match(pattern, files): self.bbfiles_ok = True -- cgit 1.2.3-korg