Fix types when evaluating interpreter #36541
Merged
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
sivel
changed the title
nitzmahone
approved these changes
Feb 21, 2018
ansibot
added
bugfix_pull_request
needs_triage
sivel
removed
the
needs_triage
* One fix: be sure to turn args into text before passing to _get_shebang() * Rename variables that contain bytes to b_* * Get rid of to_text() and to_bytes() calls that do nothing (because the data is already the proper type)
|
+1 to merge |
|
@abadger the changes LGTM. Tested against py3 and py2 and get the expected outcome. |
nitzmahone
approved these changes
Feb 22, 2018
abadger
pushed a commit
that referenced
this pull request
Feb 22, 2018
abadger
pushed a commit
to abadger/ansible
that referenced
this pull request
Feb 22, 2018
* Fix types when evaluating interpreter. Fixes ansible#36536 * Rename variables that contain bytes to b_* * Get rid of to_text() and to_bytes() calls that do nothing (because the data is already the proper type) (cherry picked from commit a4df4d3)
|
Merged to devel. cherrypicked for 2.4.4-beta1. PR #36561 opened to cherrypick to stable-2.5 for 2.5.0rc1 |
abadger
added a commit
that referenced
this pull request
Feb 22, 2018
* Fix types when evaluating interpreter (#36541) * Fix types when evaluating interpreter. Fixes #36536 * Rename variables that contain bytes to b_* * Get rid of to_text() and to_bytes() calls that do nothing (because the data is already the proper type) (cherry picked from commit a4df4d3) * Changelog entry for the ansible_*_interpreter fix
ansibot
added
bug
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
SUMMARY
Fix types used in
modify_modulewhen evaluating the interpreter. Fixes #36536Using
strinside ofshlex.splitresults in['b/usr/bin/python']. And passing a byte string to_get_shebangproduces aninterpreter_configofu"ansible_b'python'_interpreter"which then wouldn't be located in task vars.ISSUE TYPE
COMPONENT NAME
lib/ansible/executor/module_common.py
ANSIBLE VERSION
ADDITIONAL INFORMATION