From 872e392c50df3ee6eceffc3c6902ef1fc3f0e3ce Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 28 May 2013 14:32:53 +0100 Subject: [PATCH] bitbake: server/bitbake: Remove launchUI method With the removal of the none server type, we can remove the launchUI method and simplify the code slightly. (Bitbake rev: 9bef2f2dd0bcaa59528ebcb3c1ce053b7dff1ec6) Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 2 +- bitbake/lib/bb/server/process.py | 4 ---- bitbake/lib/bb/server/xmlrpc.py | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index a868557..6c43aa8 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/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/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index 5e2cade..163dbbb 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/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/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py index 9482923..ca3a401 100644 --- a/bitbake/lib/bb/server/xmlrpc.py +++ b/bitbake/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) - - -- 2.7.4