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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e118ee3ad8
commit
3fb25ef24b
|
@ -271,7 +271,7 @@ def main():
|
||||||
os.environ[k] = cleanedvars[k]
|
os.environ[k] = cleanedvars[k]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return server.launchUI(ui_main, server_connection.connection, server_connection.events, configParams)
|
return ui_main(server_connection.connection, server_connection.events, configParams)
|
||||||
finally:
|
finally:
|
||||||
bb.event.ui_queue = []
|
bb.event.ui_queue = []
|
||||||
server_connection.terminate()
|
server_connection.terminate()
|
||||||
|
|
|
@ -264,7 +264,3 @@ class BitBakeServer(object):
|
||||||
self.connection = BitBakeServerConnection(self)
|
self.connection = BitBakeServerConnection(self)
|
||||||
signal.signal(signal.SIGTERM, lambda i, s: self.connection.terminate(force=True))
|
signal.signal(signal.SIGTERM, lambda i, s: self.connection.terminate(force=True))
|
||||||
return self.connection
|
return self.connection
|
||||||
|
|
||||||
def launchUI(self, uifunc, *args):
|
|
||||||
return uifunc(*args)
|
|
||||||
|
|
||||||
|
|
|
@ -288,8 +288,3 @@ class BitBakeServer(object):
|
||||||
def establishConnection(self):
|
def establishConnection(self):
|
||||||
self.connection = BitBakeServerConnection(self.serverinfo)
|
self.connection = BitBakeServerConnection(self.serverinfo)
|
||||||
return self.connection
|
return self.connection
|
||||||
|
|
||||||
def launchUI(self, uifunc, *args):
|
|
||||||
return uifunc(*args)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue