cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix a case where we mixed text and bytes in the local connection plugin

Browse source 
Fixes #20710
This commit is contained in:
Toshio Kuratomi 2017-02-21 10:28:54 -08:00
parent 6a4324ee99
commit 2dde7f7768
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/connection/local.py
View file

@ -28,7 +28,7 @@ import ansible.constants as C
from ansible.compat import selectors from ansible.compat import selectors
from ansible.compat.six import text_type, binary_type from ansible.compat.six import text_type, binary_type
from ansible.errors import AnsibleError, AnsibleFileNotFound from ansible.errors import AnsibleError, AnsibleFileNotFound
from ansible.module_utils._text import to_bytes, to_native from ansible.module_utils._text import to_bytes, to_native, to_text
from ansible.plugins.connection import ConnectionBase from ansible.plugins.connection import ConnectionBase
@ -67,7 +67,7 @@ class Connection(ConnectionBase):
executable = C.DEFAULT_EXECUTABLE.split()[0] if C.DEFAULT_EXECUTABLE else None executable = C.DEFAULT_EXECUTABLE.split()[0] if C.DEFAULT_EXECUTABLE else None
display.vvv(u"EXEC {0}".format(cmd), host=self._play_context.remote_addr) display.vvv(u"EXEC {0}".format(to_text(cmd)), host=self._play_context.remote_addr)
display.debug("opening command with Popen()") display.debug("opening command with Popen()")
if isinstance(cmd, (text_type, binary_type)): if isinstance(cmd, (text_type, binary_type)):