summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbitbake/bin/bitbake6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 6c43aa8ccf..86cf3a8ae8 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -70,7 +70,7 @@ def get_ui(config):
70 # suggest a fixed set this allows you to have flexibility in which 70 # suggest a fixed set this allows you to have flexibility in which
71 # ones are available. 71 # ones are available.
72 module = __import__("bb.ui", fromlist = [interface]) 72 module = __import__("bb.ui", fromlist = [interface])
73 return getattr(module, interface).main 73 return getattr(module, interface)
74 except AttributeError: 74 except AttributeError:
75 sys.exit("FATAL: Invalid user interface '%s' specified.\n" 75 sys.exit("FATAL: Invalid user interface '%s' specified.\n"
76 "Valid interfaces: depexp, goggle, ncurses, hob, knotty [default]." % interface) 76 "Valid interfaces: depexp, goggle, ncurses, hob, knotty [default]." % interface)
@@ -189,7 +189,7 @@ def main():
189 configuration = cookerdata.CookerConfiguration() 189 configuration = cookerdata.CookerConfiguration()
190 configuration.setConfigParameters(configParams) 190 configuration.setConfigParameters(configParams)
191 191
192 ui_main = get_ui(configuration) 192 ui_module = get_ui(configParams)
193 193
194 # Server type can be xmlrpc or process currently, if nothing is specified, 194 # Server type can be xmlrpc or process currently, if nothing is specified,
195 # the default server is process 195 # the default server is process
@@ -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 ui_main(server_connection.connection, server_connection.events, configParams) 274 return ui_module.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()