valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #38946 from rallytime/bp-37632

Browse Source 
Back-port #37632 to 2016.3
This commit is contained in:
Mike Place 2017-01-25 12:40:39 -07:00 committed by GitHub
commit e4514ca7d8
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: