New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes problem with Version and OS Release related grains on certain versions of Python #42347

Merged
merged 1 commit into from Jul 19, 2017

Conversation

Projects
None yet
5 participants
@twangboy
Contributor

twangboy commented Jul 17, 2017

What does this PR do?

Starting with Python 2.7.12 and 3.5.2 the platform.uname() function started reporting the Desktop version instead of the Server version on Server versions of Windows, so we need to look those up

https://bugs.python.org/issue26513

This PR changes the way that issue is detected to account for future versions of Python where the issue may be fixed.

What issues does this PR fix or reference?

#42342

Previous Behavior

version.py and grains\core.py were hard coded to check for certain versions of Python and lookup the correct Server release in the lookup dictionary.

New Behavior

version.py and grains\core.py will now return the server version if it detects that it is a server and the desktop release is found in the lookup dictionary. It is not based on a specific version of Python.

Tests written?

No

@salt-jenkins

This comment has been minimized.

Show comment
Hide comment
@salt-jenkins

salt-jenkins Jul 17, 2017

Contributor

@twangboy, thanks for your PR! By analyzing the history of the files in this pull request, we identified @s0undt3ch, @thatch45 and @skizunov to be potential reviewers.

Contributor

salt-jenkins commented Jul 17, 2017

@twangboy, thanks for your PR! By analyzing the history of the files in this pull request, we identified @s0undt3ch, @thatch45 and @skizunov to be potential reviewers.

@cachedout cachedout merged commit d385dfd into saltstack:2017.7 Jul 19, 2017

5 of 8 checks passed

jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #277 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #286 — FAILURE
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #15490 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #8295 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #12878 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #12831 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #12980 — SUCCESS
Details

@twangboy twangboy deleted the twangboy:win_fix_ver_grains branch Aug 21, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment