From 51864054da77830d95b3e7843e0955507d7b77ba Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 15 Apr 2010 07:49:54 -0700 Subject: Move the python version check before the module imports, in case the modules utilize the newer python features (Bitbake rev: 87c15dfcbeb10e7cafb14726209e4954671b3dbe) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'bitbake/bin') diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index 805d60102f..7c1eb5f75a 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -22,10 +22,16 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -import sys, os, optparse +import sys +if sys.hexversion < 0x020600F0: + print "Sorry, python 2.6 or later is required for this version of bitbake" + sys.exit(1) + +import os sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib')) +import optparse import warnings import bb import bb.msg @@ -37,9 +43,6 @@ from bb.server import none __version__ = "1.9.0" -if sys.hexversion < 0x020600F0: - print "Sorry, python 2.6 or later is required for this version of bitbake" - sys.exit(1) #============================================================================# -- cgit v1.2.3-54-g00ecf