summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2011-01-05 11:24:14 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-05 11:24:14 +0000
commit0f70631544532f4beb39856dbdcbbf01c7860257 (patch)
treef8bfa01577a9aa485551065998281a037cb27e1a /bitbake/lib/bb/ui
parent2e0ef25a50c6a31cd6de52dfb31a04b77e694da3 (diff)
downloadpoky-0f70631544532f4beb39856dbdcbbf01c7860257.tar.gz
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>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r--bitbake/lib/bb/ui/depexp.py2
-rw-r--r--bitbake/lib/bb/ui/knotty.py3
2 files changed, 0 insertions, 5 deletions
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):
99 self.pkg_treeview.get_selection().connect("changed", self.on_cursor_changed) 99 self.pkg_treeview.get_selection().connect("changed", self.on_cursor_changed)
100 column = gtk.TreeViewColumn("Package", gtk.CellRendererText(), text=COL_PKG_NAME) 100 column = gtk.TreeViewColumn("Package", gtk.CellRendererText(), text=COL_PKG_NAME)
101 self.pkg_treeview.append_column(column) 101 self.pkg_treeview.append_column(column)
102 column.set_sort_column_id(COL_PKG_NAME)
103 pane.add1(scrolled) 102 pane.add1(scrolled)
104 scrolled.add(self.pkg_treeview) 103 scrolled.add(self.pkg_treeview)
105 104
@@ -264,7 +263,6 @@ def main(server, eventHandler):
264 gtk.gdk.threads_enter() 263 gtk.gdk.threads_enter()
265 pbar.update(x, progress_total) 264 pbar.update(x, progress_total)
266 gtk.gdk.threads_leave() 265 gtk.gdk.threads_leave()
267
268 continue 266 continue
269 267
270 if isinstance(event, bb.event.ParseCompleted): 268 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
22 22
23import os 23import os
24import sys 24import sys
25import itertools
26import xmlrpclib 25import xmlrpclib
27import logging 26import logging
28import progressbar 27import progressbar
29import bb.msg 28import bb.msg
30from bb import ui
31from bb.ui import uihelper 29from bb.ui import uihelper
32 30
33logger = logging.getLogger("BitBake") 31logger = logging.getLogger("BitBake")
@@ -209,7 +207,6 @@ def main(server, eventHandler):
209 event.stats.completed + event.stats.active + 207 event.stats.completed + event.stats.active +
210 event.stats.failed + 1, 208 event.stats.failed + 1,
211 event.stats.total, event.taskid, event.taskstring) 209 event.stats.total, event.taskid, event.taskstring)
212
213 continue 210 continue
214 211
215 if isinstance(event, bb.runqueue.runQueueTaskFailed): 212 if isinstance(event, bb.runqueue.runQueueTaskFailed):