server/bitbake: Remove launchUI method

With the removal of the none server type, we can remove the launchUI
method and simplify the code slightly.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bin/bitbake b/bin/bitbake
index a868557a1ad8d2a41f680fdd023d955ebbd8e3f3..6c43aa8ccf88619cdbebf94da3895e172005f9d8 100755 (executable)
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -271,7 +271,7 @@ def main():
             os.environ[k] = cleanedvars[k]
 
         try:
-            return server.launchUI(ui_main, server_connection.connection, server_connection.events, configParams)
+            return ui_main(server_connection.connection, server_connection.events, configParams)
         finally:
             bb.event.ui_queue = []
             server_connection.terminate()

diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py
index 5e2cade26771341e8aaf42f09befefbaf4fe83b0..163dbbb99746c14032d28a4ba1e56bd30ca3b42f 100644 (file)
--- a/lib/bb/server/process.py
+++ b/lib/bb/server/process.py
@@ -264,7 +264,3 @@ class BitBakeServer(object):
         self.connection = BitBakeServerConnection(self)
         signal.signal(signal.SIGTERM, lambda i, s: self.connection.terminate(force=True))
         return self.connection
-
-    def launchUI(self, uifunc, *args):
-        return uifunc(*args)
-

diff --git a/lib/bb/server/xmlrpc.py b/lib/bb/server/xmlrpc.py
index 9482923df4a568f9091293a10fa2f7617cba6801..ca3a40101305474ec4382452de8ba6cd2a7d0f8a 100644 (file)
--- a/lib/bb/server/xmlrpc.py
+++ b/lib/bb/server/xmlrpc.py
@@ -288,8 +288,3 @@ class BitBakeServer(object):
     def establishConnection(self):
         self.connection = BitBakeServerConnection(self.serverinfo)
         return self.connection
-
-    def launchUI(self, uifunc, *args):
-        return uifunc(*args)
-
-