From 231d3a534cdf75b3db588329fbd5d2a0fbbfba5e Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Thu, 15 Apr 2010 08:14:53 -0700
Subject: Drop an unnecessary second python version check and use the less ugly
sys.version_info
(Bitbake rev: 8f4b7b10f8740a41c085beeca5105f15204b0979)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
bitbake/bin/bitbake | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
(limited to 'bitbake/bin')
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 8db6047468..a8d6fd9d08 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -23,8 +23,8 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import sys
-if sys.hexversion < 0x020600F0:
- print "Sorry, python 2.6 or later is required for this version of bitbake"
+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
@@ -92,10 +92,6 @@ warnings.simplefilter("ignore", DeprecationWarning)
def main():
return_value = 0
- pythonver = sys.version_info
- if pythonver[0] < 2 or (pythonver[0] == 2 and pythonver[1] < 5):
- print "Sorry, bitbake needs python 2.5 or later."
- sys.exit(1)
parser = optparse.OptionParser(
version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__),
--
cgit v1.2.3