Skip to content
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

Fix 46034 2019.2.1 #54235

Merged
merged 3 commits into from Aug 22, 2019

Conversation

@github-abcde
Copy link
Contributor

commented Aug 16, 2019

What does this PR do?

This PR prevents salt.utils.yaml.safe_load from stomping arguments that only consist of a single exclamation mark.

What issues does this PR fix or reference?

#46034

Previous Behavior

When using ! as an argument, like in 46034, safe_load changes this to '' (empty string).

New Behavior

The argument ! is kept as is.

Tests written?

Yes

Commits signed with GPG?

Yes

Apparently (after watching Jenkins tests fail), what yaml.safe_load returns
depends not on the version of salt, but on some other external dependency.
Because of this, fix both possible return values.
@dwoz
dwoz approved these changes Aug 22, 2019
@dwoz dwoz merged commit 993c341 into saltstack:2019.2.1 Aug 22, 2019
23 of 24 checks passed
23 of 24 checks passed
ci/py3/windows2016 This commit cannot be built
Details
WIP Ready for review
Details
ci/docs This commit looks good
Details
ci/lint This commit looks good
Details
ci/py2/amazon2 This commit looks good
Details
ci/py2/centos6 This commit looks good
Details
ci/py2/centos7 This commit looks good
Details
ci/py2/centos7/tcp This commit looks good
Details
ci/py2/debian8 This commit looks good
Details
ci/py2/debian9 This commit looks good
Details
ci/py2/fedora29 This commit looks good
Details
ci/py2/ubuntu1604 This commit looks good
Details
ci/py2/ubuntu1604/tcp This commit looks good
Details
ci/py2/ubuntu1804 This commit looks good
Details
ci/py2/windows2016 This commit looks good
Details
ci/py3/amazon2 This commit looks good
Details
ci/py3/centos7 This commit looks good
Details
ci/py3/centos7/tcp This commit looks good
Details
ci/py3/debian8 This commit looks good
Details
ci/py3/debian9 This commit looks good
Details
ci/py3/fedora29 This commit looks good
Details
ci/py3/ubuntu1604 This commit looks good
Details
ci/py3/ubuntu1604/tcp This commit looks good
Details
ci/py3/ubuntu1804 This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.