Move the python version check into the python package

This ensures the check is run for anyone using the package, including
setup.py, though it's sad that it's necessary, since all it really wants is
__version__.

Ideally, we'd avoid the version check entirely in favor of checking for
functionality, but that's rather difficult with language constructs like
context managers, so this'll do for now.

(Bitbake rev: f936f1c0edf70860ea0f39ec1a500ba43b56f289)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index a8d6fd9d087d4d9dbdaa232f760f496c16b64415..82af9a719022da2b82295d375871097e04e40ab1 100755 (executable)
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -22,12 +22,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import sys
-if sys.version_info < (2, 6, 0):
-    print "Sorry, python 2.6.0 or later is required for this version of bitbake"
-    sys.exit(1)
-
 import os
+import sys
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])),
                                 'lib'))
 

diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index bf2f35a73003a82de12326835a8532eb3592ba7d..e4a970c640637bd099b161f21bb1569d6e270433 100644 (file)
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/lib/bb/__init__.py
@@ -23,6 +23,10 @@
 
 __version__ = "1.11.0"
 
+import sys
+if sys.version_info < (2, 6, 0):
+    raise RuntimeError("Sorry, python 2.6.0 or later is required for this version of bitbake")
+
 import os
 import bb.msg