From 21a9692c7daf1498f862f5dbe1b85201df39baa7 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 9 Apr 2010 13:25:58 -0700 Subject: Use __import__ for the ui rather than exec (Bitbake rev: 7d00bab300961431f9960cf6759966f608580bc0) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bitbake/bin') diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index cef59c9117..c2088d9320 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -181,12 +181,12 @@ Default BBFILES are the .bb files in the current directory.""" ) ui = "knotty" try: - # Dynamically load the UI based on the ui name. Although we - # suggest a fixed set this allows you to have flexibility in which - # ones are available. - exec "from bb.ui import " + ui - exec "return_value = " + ui + ".init(serverConnection.connection, serverConnection.events)" - except ImportError: + # Dynamically load the UI based on the ui name. Although we + # suggest a fixed set this allows you to have flexibility in which + # ones are available. + uimodule = __import__("bb.ui", fromlist=[ui]) + return_value = getattr(uimodule, ui).init(serverConnection.connection, serverConnection.events) + except AttributeError: print "FATAL: Invalid user interface '%s' specified. " % ui print "Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'." except Exception, e: -- cgit v1.2.3