Skip to content

Commit 7a320c3

Browse files
jhunkelermdlpstsci
andauthored
MacOS is not guaranteed to use major.minor.patch versions anymore. Handle it. (spacetelescope#571)
Co-authored-by: mdlpstsci <[email protected]>
1 parent 9229a44 commit 7a320c3

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

wscript

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,13 @@ def _check_mac_osx_version(floor_version):
329329
return None
330330

331331
# Extract the integer values between the '.'s
332-
osx_version_major, osx_version_minor, osx_version_patch = tuple(int(x) for x in s.strip().split('.'))
332+
osx_version_data = tuple(int(x) for x in s.strip().split('.'))
333+
osx_version_major = osx_version_data[0]
334+
osx_version_minor = osx_version_data[1]
335+
osx_version_patch = 0
336+
337+
if len(osx_version_data) > 2:
338+
osx_version_patch = osx_version_data[2]
333339

334340
# Convert major/minor/patch values into a single 24-bit integer
335341
osx_version = (osx_version_major & 0xff) << 16 | (osx_version_minor & 0xff) << 8 | (osx_version_patch & 0xff )

0 commit comments

Comments
 (0)