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

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

Browse source 
This reverts commit c4da5840b5.

Going to do this in the connection plugins
This commit is contained in:
Toshio Kuratomi 2015-12-22 11:11:50 -08:00
parent cd3cfa93bf
commit 559ba467c0
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -488,6 +488,8 @@ 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
@ -504,7 +506,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("_low_level_execute_command(): executing: %s" % (cmd,)) display.debug("_low_level_execute_command(): executing: %s" % (cmd,))
rc, stdout, stderr = self._connection.exec_command(to_bytes(cmd, errors='strict'), in_data=in_data, sudoable=sudoable) rc, stdout, stderr = self._connection.exec_command(cmd, in_data=in_data, sudoable=sudoable)
# 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.
# Convert either one to a text type # Convert either one to a text type