Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2014-10-13 09:44:03 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2014-10-13 10:30:12 (GMT) |
| commit | 3f9c73993358b3636e3244f3e29cb4ee916e7b02 (patch) | |
| tree | 334256f3dd7880f94537e4833ca76fab31fd65f9 /BuildTools/SCons/Version.py | |
| parent | c7cd9c8d239c1c5d604de8862625741754138771 (diff) | |
| download | swift-contrib-3f9c73993358b3636e3244f3e29cb4ee916e7b02.zip swift-contrib-3f9c73993358b3636e3244f3e29cb4ee916e7b02.tar.bz2 | |
Regress Python requirement to 2.4 again
Test-information:
Ran through the configuration step on a machine with only Python 2.4
Change-Id: I3d5ba54395ede875c7f21c2769151fe6d308e760
Diffstat (limited to 'BuildTools/SCons/Version.py')
| -rw-r--r-- | BuildTools/SCons/Version.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/Version.py b/BuildTools/SCons/Version.py index 2f3b5a5..4fd9171 100644 --- a/BuildTools/SCons/Version.py +++ b/BuildTools/SCons/Version.py @@ -40,6 +40,6 @@ def getBuildVersion(root, project) : def convertToWindowsVersion(version) : version_match = re.match("(\d+)\.(\d+)(.*)", version) - major = int(version_match.group(1)) if version_match else 0 - minor = int(version_match.group(2)) if version_match else 0 + major = version_match and int(version_match.group(1)) or 0 + minor = version_match and int(version_match.group(2)) or 0 if version_match and len(version_match.group(3)) == 0 : patch = 60000 |