6 files changed, 10 insertions, 21 deletions

diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 1dbaf96b41..51cb87e285 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -46,9 +46,6 @@ __version__ = "1.11.0"
 logger = logging.getLogger("BitBake")
 
 
-#============================================================================#
-# BBOptions
-#============================================================================#
 class BBConfiguration(object):
     """
     Manages build options and configurations for one run
@@ -89,13 +86,8 @@ warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
 warnings.filterwarnings("ignore", category=ImportWarning)
 warnings.filterwarnings("ignore", category=DeprecationWarning, module="<string>$")
 
-#============================================================================#
-# main
-#============================================================================#
 
 def main():
-    return_value = 1
-
     parser = optparse.OptionParser(
         version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__),
         usage = """%prog [options] [package ...]
@@ -190,7 +182,6 @@ Default BBFILES are the .bb files in the current directory.""")
     bb.utils.clean_environment()
 
     cooker = bb.cooker.BBCooker(configuration, server)
-
     cooker.parseCommandLine()
 
     serverinfo = server.BitbakeServerInfo(cooker.server)
@@ -201,7 +192,7 @@ Default BBFILES are the .bb files in the current directory.""")
     logger.removeHandler(loghandler)
 
     # Setup a connection to the server (cooker)
-    serverConnection = server.BitBakeServerConnection(serverinfo)
+    server_connection = server.BitBakeServerConnection(serverinfo)
 
     # Launch the UI
     if configuration.ui:
@@ -214,17 +205,15 @@ Default BBFILES are the .bb files in the current directory.""")
             # Dynamically load the UI based on the ui name. Although we
             # suggest a fixed set this allows you to have flexibility in which
             # ones are available.
-            uimodule = __import__("bb.ui", fromlist = [ui])
-            ui_init = getattr(uimodule, ui).init
+            module = __import__("bb.ui", fromlist = [ui])
+            ui_main = getattr(module, ui).main
         except AttributeError:
             print("FATAL: Invalid user interface '%s' specified. " % ui)
             print("Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'.")
         else:
-            return_value = server.BitbakeUILauch().launch(serverinfo, ui_init, serverConnection.connection, serverConnection.events)
+            return server.BitbakeUILauch().launch(serverinfo, ui_main, server_connection.connection, server_connection.events)
     finally:
-        serverConnection.terminate()
-
-    return return_value
+        server_connection.terminate()
 
 if __name__ == "__main__":
     ret = main()
diff --git a/bitbake/lib/bb/ui/depexp.py b/bitbake/lib/bb/ui/depexp.py
index 155a892f9f..31004db44a 100644
--- a/bitbake/lib/bb/ui/depexp.py
+++ b/bitbake/lib/bb/ui/depexp.py
@@ -185,7 +185,7 @@ class gtkthread(threading.Thread):
         gtk.main()
         gtkthread.quit.set()
 
-def init(server, eventHandler):
+def main(server, eventHandler):
 
     try:
         cmdline = server.runCommand(["getCmdLineAction"])
diff --git a/bitbake/lib/bb/ui/goggle.py b/bitbake/lib/bb/ui/goggle.py
index 858ca14c45..40923ba88d 100644
--- a/bitbake/lib/bb/ui/goggle.py
+++ b/bitbake/lib/bb/ui/goggle.py
@@ -49,7 +49,7 @@ class MainWindow (gtk.Window):
         self.set_default_size(640, 480)
         scrolled_window.add (self.cur_build_tv)
 
-def init (server, eventHandler):
+def main (server, eventHandler):
     gobject.threads_init()
     gtk.gdk.threads_init()
 
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index 21160bff5f..9385883ea9 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -66,7 +66,7 @@ class BBLogFormatter(logging.Formatter):
         else:
             return logging.Formatter.format(self, record)
 
-def init(server, eventHandler):
+def main(server, eventHandler):
 
     # Get values of variables which control our output
     includelogs = server.runCommand(["getVariable", "BBINCLUDELOGS"])
diff --git a/bitbake/lib/bb/ui/ncurses.py b/bitbake/lib/bb/ui/ncurses.py
index 3fed4c58a8..3bc8373964 100644
--- a/bitbake/lib/bb/ui/ncurses.py
+++ b/bitbake/lib/bb/ui/ncurses.py
@@ -324,7 +324,7 @@ class NCursesUI:
                 shutdown = shutdown + 1
                 pass
 
-def init(server, eventHandler):
+def main(server, eventHandler):
     if not os.isatty(sys.stdout.fileno()):
         print("FATAL: Unable to run 'ncurses' UI without a TTY.")
         return
diff --git a/bitbake/lib/bb/ui/puccho.py b/bitbake/lib/bb/ui/puccho.py
index a627fc803f..3ce4590c16 100644
--- a/bitbake/lib/bb/ui/puccho.py
+++ b/bitbake/lib/bb/ui/puccho.py
@@ -390,7 +390,7 @@ def running_build_failed_cb (running_build, manager):
     print("build failed")
     manager.notify_build_failed ()
 
-def init (server, eventHandler):
+def main (server, eventHandler):
     # Initialise threading...
     gobject.threads_init()
     gtk.gdk.threads_init()