Hob bug fixes

PATCH Applied Joshua Lock 2 participants 5 messages Sep 23, 2011 – Sep 25, 2011

Share & tools

Joshua Lock

author

2011-09-23 20:40 UTC #0 lore raw

cover Hob bug fixes

This series includes a few fixes found whilst debugging and fixing Yocto bug #1521
http://bugzilla.yoctoproject.org/show_bug.cgi?id=1521

Richard, please consider these for Yocto 1.1

Regards,
Joshua

The following changes since commit 623e9c7f7a9cf12b8c81c26cc608990682a601dd:

Fix mercurial fetcher in fetch2 (2011-09-21 14:07:14 +0100)

are available in the git repository at:
git://github.com/incandescant/bitbake hob
https://github.com/incandescant/bitbake/tree/hob

Joshua Lock (3):
ui/crumbs/hobeventhandler: move remaining getVariable calls to init ui/crumbs/hobeventhandler: fix variable name typo
hob: fix building with current selections after reparse

 lib/bb/ui/crumbs/hobeventhandler.py |   11 ++++++-----
 lib/bb/ui/hob.py                    |    2 --
 2 files changed, 6 insertions(+), 7 deletions(-)

Signature · 1 line

1.7.6.2

Joshua Lock

author

2011-09-23 20:40 UTC #1 lore raw

PATCH 1/3 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 <[email protected]>

---
 lib/bb/ui/crumbs/hobeventhandler.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

lib/bb/ui/crumbs/hobeventhandler.py +5 -4

index 30504e1..44dc4ac 100644
@@ -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

Signature · 1 line

1.7.6.2

Joshua Lock

author

2011-09-23 20:40 UTC #2 lore raw

PATCH 2/3 ui/crumbs/hobeventhandler: fix variable name typo

In reply to Joshua Lock

Signed-off-by Joshua Lock <[email protected]>

---
 lib/bb/ui/crumbs/hobeventhandler.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

lib/bb/ui/crumbs/hobeventhandler.py +1 -1

index 44dc4ac..ddab987 100644
@@ -328,7 +328,7 @@ class HobHandler(gobject.GObject):
         return self.image_output_types
 
     def get_image_deploy_dir(self):
-        return self.img_out_dir
+        return self.image_out_dir
 
     def make_temp_dir(self):
         bb.utils.mkdirhier(self.image_dir)

Signature · 1 line

1.7.6.2

Joshua Lock

author

2011-09-23 20:40 UTC #3 lore raw

PATCH 3/3 hob: fix building with current selections after reparse

In reply to Joshua Lock

After the reparse we were setting the model to reflect the values before the reparse was triggered but clearing the internal variables used to test whether these values are set, leading to the UI erroneously reporting that selections had not been made.

Signed-off-by Joshua Lock <[email protected]>

---
 lib/bb/ui/hob.py |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

lib/bb/ui/hob.py +0 -2

index e696314..c016e44 100644
@@ -304,13 +304,11 @@ class MainWindow (gtk.Window):
                 self.image_combo.disconnect(self.image_combo_id)
                 self.image_combo_id = None
             self.model.set_selected_image(self.selected_image)
-            self.selected_image = None
             if not self.image_combo_id:
                 self.image_combo_id = self.image_combo.connect("changed", self.image_changed_cb)
 
         if self.selected_packages:
             self.model.set_selected_packages(self.selected_packages)
-            self.selected_packages = None
 
     def reset_clicked_cb(self, button):
         lbl = "<b>Reset your selections?</b>\n\nAny new changes you have made will be lost"

Signature · 1 line

1.7.6.2

Richard Purdie

Applied

2011-09-25 15:32 UTC #4 lore raw

In reply to Joshua Lock

Quoted 13 lines · Joshua Lock

This series includes a few fixes found whilst debugging and fixing Yocto bug #1521
http://bugzilla.yoctoproject.org/show_bug.cgi?id=1521
Richard, please consider these for Yocto 1.1
Regards,
Joshua
The following changes since commit 623e9c7f7a9cf12b8c81c26cc608990682a601dd:
Fix mercurial fetcher in fetch2 (2011-09-21 14:07:14 +0100)

Quoted 8 lines

are available in the git repository at:
git://github.com/incandescant/bitbake hob
https://github.com/incandescant/bitbake/tree/hob
Joshua Lock (3):
ui/crumbs/hobeventhandler: move remaining getVariable calls to init ui/crumbs/hobeventhandler: fix variable name typo
hob: fix building with current selections after reparse

Merged to master, thanks.

Richard