diff options
| author | Joshua Lock <josh@linux.intel.com> | 2011-05-10 17:07:56 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-16 20:48:34 +0100 |
| commit | 5251d9d9a5644aa463a9e40c6291562a44ca0c82 (patch) | |
| tree | dd0e53d63391674d0673d704626a08a80a263abe | |
| parent | aa721aa065ffdb5eef3f0e3ed87160f72a2d7182 (diff) | |
| download | poky-5251d9d9a5644aa463a9e40c6291562a44ca0c82.tar.gz | |
bitbake/ui: Fix Gtk+ GUI's after recent cache changes
(Bitbake rev: 2bc8f405ec552ae0f1a79790569b2d044a35d3ba)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/runningbuild.py | 4 | ||||
| -rw-r--r-- | 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 84f304352e..c474491d6a 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): | |||
| 102 | elif isinstance(event, bb.event.CacheLoadCompleted) and pbar: | 102 | elif isinstance(event, bb.event.CacheLoadCompleted) and pbar: |
| 103 | pbar.update(bb.ui.crumbs.hobeventhandler.progress_total, bb.ui.crumbs.hobeventhandler.progress_total) | 103 | pbar.update(bb.ui.crumbs.hobeventhandler.progress_total, bb.ui.crumbs.hobeventhandler.progress_total) |
| 104 | elif isinstance(event, bb.event.ParseStarted) and pbar: | 104 | elif isinstance(event, bb.event.ParseStarted) and pbar: |
| 105 | if event.total == 0: | ||
| 106 | return | ||
| 105 | pbar.set_title("Processing recipes") | 107 | pbar.set_title("Processing recipes") |
| 106 | bb.ui.crumbs.hobeventhandler.progress_total = event.total | 108 | bb.ui.crumbs.hobeventhandler.progress_total = event.total |
| 107 | pbar.update(0, bb.ui.crumbs.hobeventhandler.progress_total) | 109 | 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 4703e6d844..70fd57effc 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): | |||
| 234 | pbar.update(self.progress_total, self.progress_total) | 234 | pbar.update(self.progress_total, self.progress_total) |
| 235 | 235 | ||
| 236 | elif isinstance(event, bb.event.ParseStarted) and pbar: | 236 | elif isinstance(event, bb.event.ParseStarted) and pbar: |
| 237 | if event.total == 0: | ||
| 238 | return | ||
| 237 | pbar.set_title("Processing recipes") | 239 | pbar.set_title("Processing recipes") |
| 238 | self.progress_total = event.total | 240 | self.progress_total = event.total |
| 239 | pbar.update(0, self.progress_total) | 241 | pbar.update(0, self.progress_total) |
| @@ -308,4 +310,4 @@ class RunningBuildTreeView (gtk.TreeView): | |||
| 308 | 310 | ||
| 309 | clipboard = gtk.clipboard_get() | 311 | clipboard = gtk.clipboard_get() |
| 310 | clipboard.set_text(paste_url) | 312 | clipboard.set_text(paste_url) |
| 311 | clipboard.store() \ No newline at end of file | 313 | clipboard.store() |
diff --git a/bitbake/lib/bb/ui/depexp.py b/bitbake/lib/bb/ui/depexp.py index 3dbd5e0eca..575dd1c2b7 100644 --- a/bitbake/lib/bb/ui/depexp.py +++ b/bitbake/lib/bb/ui/depexp.py | |||
| @@ -254,6 +254,8 @@ def main(server, eventHandler): | |||
| 254 | 254 | ||
| 255 | if isinstance(event, bb.event.ParseStarted): | 255 | if isinstance(event, bb.event.ParseStarted): |
| 256 | progress_total = event.total | 256 | progress_total = event.total |
| 257 | if progress_total == 0: | ||
| 258 | continue | ||
| 257 | gtk.gdk.threads_enter() | 259 | gtk.gdk.threads_enter() |
| 258 | pbar.set_title("Processing recipes") | 260 | pbar.set_title("Processing recipes") |
| 259 | pbar.update(0, progress_total) | 261 | pbar.update(0, progress_total) |
