From e09a15927714362866297c3a7a2992506ccf4f75 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Tue, 28 May 2013 12:31:45 +0000 Subject: bitbake: bitbake: retrieve the entire ui module in launcher Slight change in bitbake as to retrieve the entire UI module for further processing instead of just the main function. Based on a patch by Bogdan Marinescu (Bitbake rev: f49341a9599d971829ef65b2b02732543740a3c9) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/bin/bitbake') 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): # suggest a fixed set this allows you to have flexibility in which # ones are available. module = __import__("bb.ui", fromlist = [interface]) - return getattr(module, interface).main + return getattr(module, interface) except AttributeError: sys.exit("FATAL: Invalid user interface '%s' specified.\n" "Valid interfaces: depexp, goggle, ncurses, hob, knotty [default]." % interface) @@ -189,7 +189,7 @@ def main(): configuration = cookerdata.CookerConfiguration() configuration.setConfigParameters(configParams) - ui_main = get_ui(configuration) + ui_module = get_ui(configParams) # Server type can be xmlrpc or process currently, if nothing is specified, # the default server is process @@ -271,7 +271,7 @@ def main(): os.environ[k] = cleanedvars[k] try: - return ui_main(server_connection.connection, server_connection.events, configParams) + return ui_module.main(server_connection.connection, server_connection.events, configParams) finally: bb.event.ui_queue = [] server_connection.terminate() -- cgit v1.2.3-54-g00ecf