summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-04-15 08:14:53 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:34 +0100
commit231d3a534cdf75b3db588329fbd5d2a0fbbfba5e (patch)
tree5ef24bf623c5d4a1b8bd2b10083cf72676720db1
parentbdbeaf476017d8f11629f74ca457f304ffd906e9 (diff)
downloadpoky-231d3a534cdf75b3db588329fbd5d2a0fbbfba5e.tar.gz
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>
-rwxr-xr-xbitbake/bin/bitbake8
1 files changed, 2 insertions, 6 deletions
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 @@
23# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 23# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
24 24
25import sys 25import sys
26if sys.hexversion < 0x020600F0: 26if sys.version_info < (2, 6, 0):
27 print "Sorry, python 2.6 or later is required for this version of bitbake" 27 print "Sorry, python 2.6.0 or later is required for this version of bitbake"
28 sys.exit(1) 28 sys.exit(1)
29 29
30import os 30import os
@@ -92,10 +92,6 @@ warnings.simplefilter("ignore", DeprecationWarning)
92 92
93def main(): 93def main():
94 return_value = 0 94 return_value = 0
95 pythonver = sys.version_info
96 if pythonver[0] < 2 or (pythonver[0] == 2 and pythonver[1] < 5):
97 print "Sorry, bitbake needs python 2.5 or later."
98 sys.exit(1)
99 95
100 parser = optparse.OptionParser( 96 parser = optparse.OptionParser(
101 version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__), 97 version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__),