only change dir to playdir if local

fixes #17869
fixes #17770

(cherry picked from commit 49ce0c8bac)
This commit is contained in:
Brian Coca 2016-10-03 08:42:32 -04:00
parent ec1f19ac3a
commit 751865d68c

View file

@ -735,13 +735,15 @@ class ActionBase(with_metaclass(ABCMeta, object)):
display.debug("_low_level_execute_command(): executing: %s" % (cmd,)) display.debug("_low_level_execute_command(): executing: %s" % (cmd,))
# Change directory to basedir of task for command execution # Change directory to basedir of task for command execution when connection is local
cwd = os.getcwd() if self._connection.transport == 'local':
os.chdir(self._loader.get_basedir()) os.chdir(self._loader.get_basedir())
cwd = os.getcwd()
try: try:
rc, stdout, stderr = self._connection.exec_command(cmd, in_data=in_data, sudoable=sudoable) rc, stdout, stderr = self._connection.exec_command(cmd, in_data=in_data, sudoable=sudoable)
finally: finally:
os.chdir(cwd) if self._connection.transport == 'local':
os.chdir(cwd)
# 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