diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2013-05-28 12:31:45 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-30 10:20:31 +0100 |
commit | e09a15927714362866297c3a7a2992506ccf4f75 (patch) | |
tree | 0e53437ae3196d9a1117ceb5d426d75093f0515e /bitbake/bin | |
parent | 52d05125c132e8f4efac5ad7a66559f0d203af1d (diff) | |
download | poky-e09a15927714362866297c3a7a2992506ccf4f75.tar.gz |
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 <bogdan.a.marinescu@intel.com>
(Bitbake rev: f49341a9599d971829ef65b2b02732543740a3c9)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-x | bitbake/bin/bitbake | 6 |
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() |