summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbitbake/bin/bitbake2
-rw-r--r--bitbake/lib/bb/server/process.py4
-rw-r--r--bitbake/lib/bb/server/xmlrpc.py5
3 files changed, 1 insertions, 10 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index a868557a1a..6c43aa8ccf 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -271,7 +271,7 @@ def main():
271 os.environ[k] = cleanedvars[k] 271 os.environ[k] = cleanedvars[k]
272 272
273 try: 273 try:
274 return server.launchUI(ui_main, server_connection.connection, server_connection.events, configParams) 274 return ui_main(server_connection.connection, server_connection.events, configParams)
275 finally: 275 finally:
276 bb.event.ui_queue = [] 276 bb.event.ui_queue = []
277 server_connection.terminate() 277 server_connection.terminate()
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index 5e2cade267..163dbbb997 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -264,7 +264,3 @@ class BitBakeServer(object):
264 self.connection = BitBakeServerConnection(self) 264 self.connection = BitBakeServerConnection(self)
265 signal.signal(signal.SIGTERM, lambda i, s: self.connection.terminate(force=True)) 265 signal.signal(signal.SIGTERM, lambda i, s: self.connection.terminate(force=True))
266 return self.connection 266 return self.connection
267
268 def launchUI(self, uifunc, *args):
269 return uifunc(*args)
270
diff --git a/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py
index 9482923df4..ca3a401013 100644
--- a/bitbake/lib/bb/server/xmlrpc.py
+++ b/bitbake/lib/bb/server/xmlrpc.py
@@ -288,8 +288,3 @@ class BitBakeServer(object):
288 def establishConnection(self): 288 def establishConnection(self):
289 self.connection = BitBakeServerConnection(self.serverinfo) 289 self.connection = BitBakeServerConnection(self.serverinfo)
290 return self.connection 290 return self.connection
291
292 def launchUI(self, uifunc, *args):
293 return uifunc(*args)
294
295