saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

swapping order of version checking logic so that lin_ver is last, since distro returns information for both Mac and Windows.

Browse source
This commit is contained in:
Gareth J. Greenaway 2020-06-02 12:57:48 -07:00 • committed by Daniel Wozniak
parent 9d2cfc2940
commit 6b2be86053
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/version.py
View file

@ -679,18 +679,18 @@ def system_information():
win_ver = platform.win32_ver()
# linux_distribution() will return a
# distribution on OS X, only return if
# we are sure we are running on Linux
# and mac_ver is empty.
if lin_ver[0] and not mac_ver[0]:
return " ".join(lin_ver)
elif mac_ver[0]:
# distribution on OS X and Windows.
# Check mac_ver and win_ver first,
# then lin_ver.
if mac_ver[0]:
if isinstance(mac_ver[1], (tuple, list)) and "".join(mac_ver[1]):
return " ".join([mac_ver[0], ".".join(mac_ver[1]), mac_ver[2]])
else:
return " ".join([mac_ver[0], mac_ver[2]])
elif win_ver[0]:
return " ".join(win_ver)
elif lin_ver[0]:
return " ".join(lin_ver)
else:
return ""