From 0f70631544532f4beb39856dbdcbbf01c7860257 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 5 Jan 2011 11:24:14 +0000
Subject: [PATCH] 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>
---
 bitbake/lib/bb/build.py     | 1 +
 bitbake/lib/bb/ui/depexp.py | 2 --
 bitbake/lib/bb/ui/knotty.py | 3 ---
 3 files changed, 1 insertion(+), 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):