mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-05 22:20:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Workaround to reliably get 'real' OS version on Big Sur. Addresses #1009

Browse Source
This commit is contained in:
Greg Neagle
2020-08-08 07:46:40 -07:00
parent c5fc0b7673
commit a60e90d5a8
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/client/munkilib/osutils.py
View File

@@ -51,7 +51,18 @@ def getOsVersion(only_major_minor=True, as_tuple=False):
only_major_minor: Boolean. If True, only include major/minor versions.
as_tuple: Boolean. If True, return a tuple of ints, otherwise a string.
"""
os_version_tuple = platform.mac_ver()[0].split('.')
# platform.mac_ver() returns 10.16-style version info on Big Sur
# and is likely to do so until Python is compiled with the macOS 11 SDK
# which may not happen for a while. And Apple's odd tricks mean that even
# reading /System/Library/CoreServices/SystemVersion.plist is unreliable.
# So let's use a different method.
try:
os_version_tuple = subprocess.check_output(
('/usr/bin/sw_vers', '-productVersion'),
env={'SYSTEM_VERSION_COMPAT': '0'}
).decode('UTF-8').rstrip().split('.')
except subprocess.CalledProcessError:
os_version_tuple = platform.mac_ver()[0].split(".")
if only_major_minor:
os_version_tuple = os_version_tuple[0:2]
if as_tuple: