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

Improve version checking

Browse source
This commit is contained in:
twangboy 2016-09-19 14:49:43 -06:00
parent 88be5a3761
commit 211fd3b47e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/grains/core.py
View file

@ -869,9 +869,12 @@ def _windows_platform_data():
# Starting with Python 2.7.12 and 3.5.2 python started reporting the
# Server version the OS as the Desktop version, so we need to look
# those up
ver = pythonversion()
if salt.utils.compare_versions(ver, '>=', [2, 7, 12, 'final', 0]) \
or salt.utils.compare_versions(ver, '>=', [3, 5, 2, 'final', 0]):
ver = pythonversion()['pythonversion']
if ((six.PY2 and
salt.utils.compare_versions(ver, '>=', [2, 7, 12, 'final', 0]))
or
(six.PY3 and
salt.utils.compare_versions(ver, '>=', [3, 5, 2, 'final', 0]))):
if info['ProductType'] > 1:
server = {'Vista': '2008Server',
'7': '2008ServerR2',