Backport #38779 to 2016.11 #39089
Merged
Backport #38779 to 2016.11 #39089
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Feb 2, 2017
* upstream/develop: (37 commits) MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic (saltstack#38829) Missing colon Fixing a weird edge case when using salt syndics and targetting via pillar. Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use. correct checking of policy_class to compare with lower() version of the specified string (saltstack#39084) Backport saltstack#38779 to 2016.11 (saltstack#39089) update adml text search to use 'starts-with' as some policies text has trailing spaces (saltstack#39090) correctly handle scenario when "storeAsText" is True on a decimal/longDecimal element object (saltstack#39088) use the pillar kwarg explicitely add ability to override pillar data during state.sls_id run. [Bugfix] Fix state x509.crl_managed Check if data['return'] is dict type add debug logging for batch vars Don't fail test if data is empty Account for trimmed value in 'salt -d' output Run test_valid_docs in batches Update primary bonding option in rh_ip.py (saltstack#39069) Update primary bonding option in debian_ip.py (saltstack#39068) Add a bunch of missing doc module references Move fileclient tests to tests/integration/fileserver/fileclient_test.py (saltstack#39081) _in_range_inclusive class method incorrectly called isinstance ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Backports #38779
Addresses an underlying issue with lxml on windows in which xml files with "encoding='unicode'" in the xml header cannot be processed (throws an xml syntax error). If an xml file with the "encoding='unicode'" is encountered, the module will attempt to remove this from the xml header and parse the file, if the parse succeeds (using utf-16 encoding) the module continues. If the parse fails, the module will log an error message that the file could not be processed and the entries from that admx/l file will not be available through the module.
What issues does this PR fix or reference?
#38100
Previous Behavior
When an admx file with "encoding='unicode'" in the xml header was parsed, an exception would be thrown and the module would exit
New Behavior
If an xml file with the "encoding='unicode'" is encountered, the module will attempt to remove this from the xml header and parse the file, if the parse succeeds the module continues. If the parse fails, the module will log an error message that the file could not be processed and the entries from that admx/l file will not be available through the module.
Tests written?
No
Please review Salt's Contributing Guide for best practices.