Bug 1385435 - Allow python2.6 to run client.py; rs=bustage-fix
authorTom Prince <mozilla@hocat.ca>
Fri, 28 Jul 2017 16:17:09 -0600
changeset 28505 433d0530406d6ecde80c1ee962393384b219fee3
parent 28504 9274ac34246c380b9181f275a1ee958ab9b2cbec
child 28506 1f0a3e17464ffabc53248e3a027fd705a9275be6
push idunknown
push userunknown
push dateunknown
reviewersbustage-fix
bugs1385435
Bug 1385435 - Allow python2.6 to run client.py; rs=bustage-fix The L10N linux repacks try to run client.py with the system python (which is python 2.6 from CentOS 6). There is nothing python 2.7 specific in client.py, so don't needlessly error out in that case. MozReview-Commit-ID: 6adOxHkqHnb
client.py
--- a/client.py
+++ b/client.py
@@ -58,18 +58,18 @@ SWITCH_MOZILLA_REPO_BACKUP_LOCATION = ".
 SWITCH_MOZILLA_REPO_OLD_REPO_LOCATION = ".mozilla-trunk"
 # This should be the same as DEFAULTS['MOZILLA_REPO'] but using %s instead
 # of http for the scheme.
 SWITCH_MOZILLA_REPO_REPLACE = '%s://hg.mozilla.org/mozilla-central/'
 SWITCH_MOZILLA_BASE_REV = "GECKO_1_9_1_BASE"
 
 import sys
 pyver = sys.version_info
-if pyver[0] <= 1 or (pyver[0] == 2 and pyver[1] < 7):
-    sys.exit("ERROR: Python 2.7 or newer required")
+if pyver[0] <= 1 or (pyver[0] == 2 and pyver[1] < 6):
+    sys.exit("ERROR: Python 2.6 or newer required")
 elif pyver[0] >= 3:
     # Python series 3 will syntax error here, Hack needed per Bug 601649c#8
     print "ERROR: Python series 3 is not supported, use python 2.7"
     sys.exit()  # Do an explicit sys.exit for code clarity.
 del pyver
 
 import os
 from optparse import OptionParser, OptionValueError