Skip to contentSkip to conversation

Fix GUI's

PATCH Applied Joshua Lock 2 participants 4 messages May 11, 2011 – May 16, 2011

lore
Share & tools
lore

Joshua Lock

author
#0 lore raw

cover Fix GUI's

From: Joshua Lock <[email protected]>

A recent sysnc with upstream BitBake changed the behaviour of cache loading such that we need to handle the ParseStarted event not having a useful total value.

This patch ensures that our three Gtk+ GUI's will continue to work as expected.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: josh/gui
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/gui

Thanks,
Joshua Lock <[email protected]>
---

Joshua Lock (1):
bitbake/ui: Fix Gtk+ GUI's after recent cache changes

 bitbake/lib/bb/ui/crumbs/hobeventhandler.py |    2 ++
 bitbake/lib/bb/ui/crumbs/runningbuild.py    |    4 +++-
 bitbake/lib/bb/ui/depexp.py                 |    2 ++
 3 files changed, 7 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.5.1
author
#1 lore raw

PATCH 1/1 bitbake/ui: Fix Gtk+ GUI's after recent cache changes

From: Joshua Lock <[email protected]>

Signed-off-by Joshua Lock <[email protected]>
---
 bitbake/lib/bb/ui/crumbs/hobeventhandler.py |    2 ++
 bitbake/lib/bb/ui/crumbs/runningbuild.py    |    4 +++-
 bitbake/lib/bb/ui/depexp.py                 |    2 ++
 3 files changed, 7 insertions(+), 1 deletions(-)
bitbake/lib/bb/ui/crumbs/hobeventhandler.py +2 -0
index 84f3043..c474491 100644
@@ -102,6 +102,8 @@ class HobHandler(gobject.GObject):
         elif isinstance(event, bb.event.CacheLoadCompleted) and pbar:
             pbar.update(bb.ui.crumbs.hobeventhandler.progress_total, bb.ui.crumbs.hobeventhandler.progress_total)
         elif isinstance(event, bb.event.ParseStarted) and pbar:
+            if event.total == 0:
+                return
             pbar.set_title("Processing recipes")
             bb.ui.crumbs.hobeventhandler.progress_total = event.total
             pbar.update(0, bb.ui.crumbs.hobeventhandler.progress_total)
bitbake/lib/bb/ui/crumbs/runningbuild.py +3 -1
index 4703e6d..70fd57e 100644
@@ -234,6 +234,8 @@ class RunningBuild (gobject.GObject):
             pbar.update(self.progress_total, self.progress_total)
 
         elif isinstance(event, bb.event.ParseStarted) and pbar:
+            if event.total == 0:
+                return
             pbar.set_title("Processing recipes")
             self.progress_total = event.total
             pbar.update(0, self.progress_total)

@@ -308,4 +310,4 @@ class RunningBuildTreeView (gtk.TreeView):
 
         clipboard = gtk.clipboard_get()
         clipboard.set_text(paste_url)
-        clipboard.store()
\ No newline at end of file
+        clipboard.store()
bitbake/lib/bb/ui/depexp.py +2 -0
index 3dbd5e0..575dd1c 100644
@@ -254,6 +254,8 @@ def main(server, eventHandler):
 
             if isinstance(event, bb.event.ParseStarted):
                 progress_total = event.total
+                if progress_total == 0:
+                    continue
                 gtk.gdk.threads_enter()
                 pbar.set_title("Processing recipes")
                 pbar.update(0, progress_total)
Signature · 1 line
1.7.5.1
author
#2 lore raw
In reply to Joshua Lock
Quoted 8 lines · Joshua Lock

From: Joshua Lock <[email protected]>

A recent sysnc with upstream BitBake changed the behaviour of cache loading such that we need to handle the ParseStarted event not having a useful total value.

This patch ensures that our three Gtk+ GUI's will continue to work as expected.

Ping? Does this need to go to upstream BitBake first?

Cheers,
Joshua

Signature · 3 lines
Joshua Lock
        Yocto Project Build Monkey
        Intel Open Source Technology Centre
Applied
#3 lore raw
In reply to Joshua Lock
Quoted 18 lines · Joshua Lock

From: Joshua Lock <[email protected]>

A recent sysnc with upstream BitBake changed the behaviour of cache loading such that we need to handle the ParseStarted event not having a useful total value.

This patch ensures that our three Gtk+ GUI's will continue to work as expected.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: josh/gui
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/gui

Thanks,
Joshua Lock <[email protected]>
---

Quoted 7 lines

Joshua Lock (1):
bitbake/ui: Fix Gtk+ GUI's after recent cache changes

 bitbake/lib/bb/ui/crumbs/hobeventhandler.py |    2 ++
 bitbake/lib/bb/ui/crumbs/runningbuild.py    |    4 +++-
 bitbake/lib/bb/ui/depexp.py                 |    2 ++
 3 files changed, 7 insertions(+), 1 deletions(-)

Merged to bitbake and to master, thanks.

Richard