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

Fix versions report for server OSs

Browse source
This commit is contained in:
twangboy 2016-11-10 17:29:03 -07:00 • committed by rallytime
parent 405d86a2ca
commit c08071e182
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
salt/version.py
View file

@ -613,12 +613,29 @@ def system_information():
else:
return ''
version = system_version()
release = platform.release()
if platform.win32_ver()[0]:
import win32api
if ((sys.version_info.major == 2 and sys.version_info >= (2,7,12)) or
(sys.version_info.major == 3 and sys.version_info >= (3,5,2))):
if win32api.GetVersionEx(1)[8] > 1:
server = {'Vista': '2008Server',
'7': '2008ServerR2',
'8': '2012Server',
'8.1': '2012ServerR2',
'10': '2016Server'}
release = server.get(platform.release(),
'UNKServer')
_, ver, sp, extra = platform.win32_ver()
version = ' '.join([release, ver, sp, extra])
system = [
('system', platform.system()),
('dist', ' '.join(platform.dist())),
('release', platform.release()),
('release', release),
('machine', platform.machine()),
('version', system_version()),
('version', version),
]
for name, attr in system: