summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-04-09 13:25:58 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:31 +0100
commit21a9692c7daf1498f862f5dbe1b85201df39baa7 (patch)
tree8856ce289b3116a843a8fe949d63213b77f3955f
parent8c5108fa21da80e30c623732a2c8ca83639488c4 (diff)
downloadpoky-21a9692c7daf1498f862f5dbe1b85201df39baa7.tar.gz
Use __import__ for the ui rather than exec
(Bitbake rev: 7d00bab300961431f9960cf6759966f608580bc0) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rwxr-xr-xbitbake/bin/bitbake12
1 files changed, 6 insertions, 6 deletions
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.""" )
181 ui = "knotty" 181 ui = "knotty"
182 182
183 try: 183 try:
184 # Dynamically load the UI based on the ui name. Although we 184 # Dynamically load the UI based on the ui name. Although we
185 # suggest a fixed set this allows you to have flexibility in which 185 # suggest a fixed set this allows you to have flexibility in which
186 # ones are available. 186 # ones are available.
187 exec "from bb.ui import " + ui 187 uimodule = __import__("bb.ui", fromlist=[ui])
188 exec "return_value = " + ui + ".init(serverConnection.connection, serverConnection.events)" 188 return_value = getattr(uimodule, ui).init(serverConnection.connection, serverConnection.events)
189 except ImportError: 189 except AttributeError:
190 print "FATAL: Invalid user interface '%s' specified. " % ui 190 print "FATAL: Invalid user interface '%s' specified. " % ui
191 print "Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'." 191 print "Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'."
192 except Exception, e: 192 except Exception, e: