diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-05 11:24:14 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-05 11:24:14 +0000 |
| commit | 0f70631544532f4beb39856dbdcbbf01c7860257 (patch) | |
| tree | f8bfa01577a9aa485551065998281a037cb27e1a | |
| parent | 2e0ef25a50c6a31cd6de52dfb31a04b77e694da3 (diff) | |
| download | openembedded-core-0f70631544532f4beb39856dbdcbbf01c7860257.tar.gz openembedded-core-0f70631544532f4beb39856dbdcbbf01c7860257.tar.bz2 openembedded-core-0f70631544532f4beb39856dbdcbbf01c7860257.zip | |
bitbake: Misc syncups with bitbake upstream, mostly whitespace and a missed line from the last UI commit
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | bitbake/lib/bb/build.py | 1 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/depexp.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index e288e35613..129150a760 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -40,6 +40,7 @@ logger = logging.getLogger('BitBake.Build') NULL = open(os.devnull, 'r+') + # When we execute a python function we'd like certain things # in all namespaces, hence we add them to __builtins__ # If we do not do this and use the exec globals, they will diff --git a/bitbake/lib/bb/ui/depexp.py b/bitbake/lib/bb/ui/depexp.py index 66ef96cdbc..13bf9ac008 100644 --- a/bitbake/lib/bb/ui/depexp.py +++ b/bitbake/lib/bb/ui/depexp.py @@ -99,7 +99,6 @@ class DepExplorer(gtk.Window): self.pkg_treeview.get_selection().connect("changed", self.on_cursor_changed) column = gtk.TreeViewColumn("Package", gtk.CellRendererText(), text=COL_PKG_NAME) self.pkg_treeview.append_column(column) - column.set_sort_column_id(COL_PKG_NAME) pane.add1(scrolled) scrolled.add(self.pkg_treeview) @@ -264,7 +263,6 @@ def main(server, eventHandler): gtk.gdk.threads_enter() pbar.update(x, progress_total) gtk.gdk.threads_leave() - continue if isinstance(event, bb.event.ParseCompleted): diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 4d87a3d7cd..7fb7f84e5b 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py @@ -22,12 +22,10 @@ from __future__ import division import os import sys -import itertools import xmlrpclib import logging import progressbar import bb.msg -from bb import ui from bb.ui import uihelper logger = logging.getLogger("BitBake") @@ -209,7 +207,6 @@ def main(server, eventHandler): event.stats.completed + event.stats.active + event.stats.failed + 1, event.stats.total, event.taskid, event.taskstring) - continue if isinstance(event, bb.runqueue.runQueueTaskFailed): |