External/macadmin-scripts
1
0
Fork 0
mirror of https://github.com/grahampugh/macadmin-scripts.git synced 2025-12-17 17:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from grahampugh/dev-packaging

Browse Source 
Allow for removal of distutils in a future python
This commit is contained in:
Graham Pugh 2022-03-08 15:13:10 +01:00 committed by GitHub
commit 69ee37ae4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
installinstallmacos.py
View File

@ -42,14 +42,18 @@ except ImportError:
from urlparse import urlsplit from urlparse import urlsplit
from xml.dom import minidom from xml.dom import minidom
from xml.parsers.expat import ExpatError from xml.parsers.expat import ExpatError
from distutils.version import LooseVersion
try:
from packaging.version import Version
except ImportError:
from distutils.version import LooseVersion as Version
try: try:
import xattr import xattr
except ImportError: except ImportError:
print( print(
"This tool requires the Python xattr module. " "This tool requires the Python xattr and packaging modules. "
"Perhaps run `pip install xattr` to install it." "Perhaps run `pip install xattr packaging` to install them."
) )
sys.exit(-1) sys.exit(-1)
@ -698,7 +702,7 @@ def os_installer_product_info(
def get_latest_version(current_item, latest_item): def get_latest_version(current_item, latest_item):
"""Compares versions between two values and returns the latest (highest) value""" """Compares versions between two values and returns the latest (highest) value"""
try: try:
if LooseVersion(current_item) > LooseVersion(latest_item): if Version(current_item) > Version(latest_item):
return current_item return current_item
else: else:
return latest_item return latest_item