Hob fixes

PATCH Applied Joshua Lock 2 participants 4 messages Sep 21, 2011

Share & tools

Joshua Lock

author

2011-09-21 01:18 UTC #0 lore raw

cover Hob fixes

The first patch is another case of my submitting patches with a dumb typo in, apologies folks, it re-enables the right-click menu for the log messages of failed tasks.

The second patch fixes the consistency and the URI of the 'Browse folder of built images" label.

Richard, please consider these for Yocto 1.1 as well as master.

Regards,
Joshua

The following changes since commit 705156e2812afb288632f01416fcbbf9add26bee:

hob: enable package only builds even if an image has been built (2011-09-19 15:28:09 -0700)

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

Joshua Lock (2):
ui/crumbs/runningbuild: fix log messages right-click menu
hob: fix opening of image output dir on image build completion

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

Signature · 1 line

1.7.6.2

Joshua Lock

author

2011-09-21 01:18 UTC #1 lore raw

PATCH 1/2 ui/crumbs/runningbuild: fix log messages right-click menu

Pass the correct callback name to the connect method.

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

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

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

index e429715..bd0cbf0 100644
@@ -325,7 +325,7 @@ class RunningBuildTreeView (gtk.TreeView):
                     menu = gtk.Menu()
                     menuitem = gtk.MenuItem("Copy")
                     menu.append(menuitem)
-                    menuitem.connect("activate", self.copy_handler, (model, it))
+                    menuitem.connect("activate", self.clipboard_handler, (model, it))
                     menuitem.show()
                     menuitem = gtk.MenuItem("Send log to pastebin")
                     menu.append(menuitem)

Signature · 1 line

1.7.6.2

Joshua Lock

author

2011-09-21 01:18 UTC #2 lore raw

PATCH 2/2 hob: fix opening of image output dir on image build completion

In reply to Joshua Lock

Firstly, rather than polling the DEPLOY_DIR_IMAGE directory each time an image is built store the variable as a member of the hobeventhandler. Secondly emit the generic "build-complete" signal *after* the specialised "build-failed" or "build-succeeded" signals such that the appropriate state variables are set before we try and use them.

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

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

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

index 393b407..30504e1 100644
@@ -79,11 +79,14 @@ class HobHandler(gobject.GObject):
         self.current_phase = None
         self.bbpath_ok = False
         self.bbfiles_ok = False
+        self.build_type = "image"
         self.image_dir = os.path.join(tempfile.gettempdir(), 'hob-images')
 
         self.model = taskmodel
         self.server = server
 
+        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(" ")
 
     def run_next_command(self):

@@ -324,7 +327,7 @@ class HobHandler(gobject.GObject):
         return self.image_output_types
 
     def get_image_deploy_dir(self):
-        return self.server.runCommand(["getVariable", "DEPLOY_DIR_IMAGE"])
+        return self.img_out_dir
 
     def make_temp_dir(self):
         bb.utils.mkdirhier(self.image_dir)

lib/bb/ui/crumbs/runningbuild.py +3 -3

index bd0cbf0..509590a 100644
@@ -242,14 +242,14 @@ class RunningBuild (gobject.GObject):
                                       Colors.OK,
                                       0))
 
-            # Emit a generic "build-complete" signal for things wishing to
-            # handle when the build is finished
-            self.emit("build-complete")
             # Emit the appropriate signal depending on the number of failures
             if (failures >= 1):
                 self.emit ("build-failed")
             else:
                 self.emit ("build-succeeded")
+            # Emit a generic "build-complete" signal for things wishing to
+            # handle when the build is finished
+            self.emit("build-complete")
 
         elif isinstance(event, bb.command.CommandFailed):
             if event.error.startswith("Exited with"):

Signature · 1 line

1.7.6.2

Richard Purdie

Applied

2011-09-21 13:12 UTC #3 lore raw

In reply to Joshua Lock

Quoted 16 lines · Joshua Lock

The first patch is another case of my submitting patches with a dumb typo in, apologies folks, it re-enables the right-click menu for the log messages of failed tasks.
The second patch fixes the consistency and the URI of the 'Browse folder of built images" label.
Richard, please consider these for Yocto 1.1 as well as master.
Regards,
Joshua
The following changes since commit 705156e2812afb288632f01416fcbbf9add26bee:
hob: enable package only builds even if an image has been built (2011-09-19 15:28:09 -0700)

Quoted 7 lines

are available in the git repository at:
git://github.com/incandescant/bitbake hob
https://github.com/incandescant/bitbake/tree/hob
Joshua Lock (2):
ui/crumbs/runningbuild: fix log messages right-click menu
hob: fix opening of image output dir on image build completion

Merged to master, thanks.

Richard