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

pull/13632/merge
Toshio Kuratomi 10 years ago
parent b33f72636a
commit c4da5840b5

@ -487,8 +487,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
@ -505,7 +503,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(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)
# 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

Loading…
Cancel
Save