* [PATCH 0/1] Fix GUI's
@ 2011-05-11 20:02 Joshua Lock
2011-05-11 20:02 ` [PATCH 1/1] bitbake/ui: Fix Gtk+ GUI's after recent cache changes Joshua Lock
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Joshua Lock @ 2011-05-11 20:02 UTC (permalink / raw)
To: poky
From: Joshua Lock <josh@linux.intel.com>
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 <josh@linux.intel.com>
---
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(-)
--
1.7.5.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] bitbake/ui: Fix Gtk+ GUI's after recent cache changes
2011-05-11 20:02 [PATCH 0/1] Fix GUI's Joshua Lock
@ 2011-05-11 20:02 ` Joshua Lock
2011-05-16 19:44 ` [PATCH 0/1] Fix GUI's Joshua Lock
2011-05-16 19:48 ` Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Joshua Lock @ 2011-05-11 20:02 UTC (permalink / raw)
To: poky
From: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
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(-)
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 84f3043..c474491 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -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)
diff --git a/bitbake/lib/bb/ui/crumbs/runningbuild.py b/bitbake/lib/bb/ui/crumbs/runningbuild.py
index 4703e6d..70fd57e 100644
--- a/bitbake/lib/bb/ui/crumbs/runningbuild.py
+++ b/bitbake/lib/bb/ui/crumbs/runningbuild.py
@@ -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()
diff --git a/bitbake/lib/bb/ui/depexp.py b/bitbake/lib/bb/ui/depexp.py
index 3dbd5e0..575dd1c 100644
--- a/bitbake/lib/bb/ui/depexp.py
+++ b/bitbake/lib/bb/ui/depexp.py
@@ -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)
--
1.7.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/1] Fix GUI's
2011-05-11 20:02 [PATCH 0/1] Fix GUI's Joshua Lock
2011-05-11 20:02 ` [PATCH 1/1] bitbake/ui: Fix Gtk+ GUI's after recent cache changes Joshua Lock
@ 2011-05-16 19:44 ` Joshua Lock
2011-05-16 19:48 ` Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Joshua Lock @ 2011-05-16 19:44 UTC (permalink / raw)
To: poky
On Wed, 2011-05-11 at 13:02 -0700, Joshua Lock wrote:
> From: Joshua Lock <josh@linux.intel.com>
>
> 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
--
Joshua Lock
Yocto Project Build Monkey
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 0/1] Fix GUI's
2011-05-11 20:02 [PATCH 0/1] Fix GUI's Joshua Lock
2011-05-11 20:02 ` [PATCH 1/1] bitbake/ui: Fix Gtk+ GUI's after recent cache changes Joshua Lock
2011-05-16 19:44 ` [PATCH 0/1] Fix GUI's Joshua Lock
@ 2011-05-16 19:48 ` Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Richard Purdie @ 2011-05-16 19:48 UTC (permalink / raw)
To: Joshua Lock; +Cc: poky
On Wed, 2011-05-11 at 13:02 -0700, Joshua Lock wrote:
> From: Joshua Lock <josh@linux.intel.com>
>
> 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 <josh@linux.intel.com>
> ---
>
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-16 19:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-11 20:02 [PATCH 0/1] Fix GUI's Joshua Lock
2011-05-11 20:02 ` [PATCH 1/1] bitbake/ui: Fix Gtk+ GUI's after recent cache changes Joshua Lock
2011-05-16 19:44 ` [PATCH 0/1] Fix GUI's Joshua Lock
2011-05-16 19:48 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.