wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert to bytes later so that make_become_command can jsut operate on text type.

Browse source 
Conflicts:
	lib/ansible/plugins/action/__init__.py
This commit is contained in:
Toshio Kuratomi 2015-12-22 08:22:02 -08:00
parent 725e40c5e6
commit bfc082fb07
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/action/__init__.py
View file

@ -499,8 +499,6 @@ class ActionBase(with_metaclass(ABCMeta, object)):
verbatim, then this won't work. May have to use some sort of verbatim, then this won't work. May have to use some sort of
replacement strategy (python3 could use surrogateescape) replacement strategy (python3 could use surrogateescape)
''' '''
# We may need to revisit this later.
cmd = to_bytes(cmd, errors='strict')
if executable is not None: if executable is not None:
cmd = executable + ' -c ' + cmd cmd = executable + ' -c ' + cmd
@ -517,7 +515,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
cmd = self._play_context.make_become_cmd(cmd, executable=executable) cmd = self._play_context.make_become_cmd(cmd, executable=executable)
display.debug("executing the command %s through the connection" % cmd) display.debug("executing the command %s through the connection" % cmd)
rc, stdout, stderr = self._connection.exec_command(cmd, in_data=in_data, sudoable=sudoable) rc, stdout, stderr = self._connection.exec_command(to_bytes(cmd, errors='strict'), in_data=in_data, sudoable=sudoable)
display.debug("command execution done: rc=%s" % (rc)) display.debug("command execution done: rc=%s" % (rc))
# stdout and stderr may be either a file-like or a bytes object. # stdout and stderr may be either a file-like or a bytes object.