Drop version requirement to 2.5 apart from XMLRPC mode

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/bin/bitbake b/bin/bitbake
index 33ae1b96e952bce762469cc12d9ba4b0f9e3a3b5..23c9d73ee40f7c1f371e69f77a1608a1a41f283d 100755 (executable)
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -31,8 +31,8 @@ from bb import ui
 
 __version__ = "1.9.0"
 
-if sys.hexversion < 0x020600F0:
-    print "Sorry, python 2.6 or later is required for this version of bitbake"
+if sys.hexversion < 0x020500F0:
+    print "Sorry, python 2.5 or later is required for this version of bitbake"
     sys.exit(1)
 
 #============================================================================#

diff --git a/lib/bb/server/xmlrpc.py b/lib/bb/server/xmlrpc.py
index b4d69f7be3a4b5a2015b52766f7adaeb7c68bb2b..3364918c77fb5502d1a94e259593526ce579598a 100644 (file)
--- a/lib/bb/server/xmlrpc.py
+++ b/lib/bb/server/xmlrpc.py
@@ -32,7 +32,7 @@
 """
 
 import bb
-import xmlrpclib
+import xmlrpclib, sys
 from bb import daemonize
 from bb.ui import uievent
 
@@ -41,6 +41,10 @@ DEBUG = False
 from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
 import inspect, select
 
+if sys.hexversion < 0x020600F0:
+    print "Sorry, python 2.6 or later is required for bitbake's XMLRPC mode"
+    sys.exit(1)
+
 class BitBakeServerCommands():
     def __init__(self, server, cooker):
         self.cooker = cooker