ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

only ignore become for making tmpdir

Browse source 
(cherry picked from commit 65ee9d2e4629cbb31178b54831612846ca7b3b69)
This commit is contained in:
Brian Coca 2017-01-26 15:18:10 -05:00
parent 0a8b856102
commit 607ef0ce80
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -221,7 +221,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
if use_system_tmp: if use_system_tmp:
tmpdir = None tmpdir = None
else: else:
tmpdir = self._remote_expand_user(C.DEFAULT_REMOTE_TMP) tmpdir = self._remote_expand_user(C.DEFAULT_REMOTE_TMP, sudoable=False)
cmd = self._connection._shell.mkdtemp(basefile, use_system_tmp, tmp_mode, tmpdir) cmd = self._connection._shell.mkdtemp(basefile, use_system_tmp, tmp_mode, tmpdir)
result = self._low_level_execute_command(cmd, sudoable=False) result = self._low_level_execute_command(cmd, sudoable=False)
@ -495,7 +495,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
finally: finally:
return x return x
def _remote_expand_user(self, path): def _remote_expand_user(self, path, sudoable=True):
''' takes a remote path and performs tilde expansion on the remote host ''' ''' takes a remote path and performs tilde expansion on the remote host '''
if not path.startswith('~'): # FIXME: Windows paths may start with "~ instead of just ~ if not path.startswith('~'): # FIXME: Windows paths may start with "~ instead of just ~
return path return path
@ -503,6 +503,9 @@ class ActionBase(with_metaclass(ABCMeta, object)):
# FIXME: Can't use os.path.sep for Windows paths. # FIXME: Can't use os.path.sep for Windows paths.
split_path = path.split(os.path.sep, 1) split_path = path.split(os.path.sep, 1)
expand_path = split_path[0] expand_path = split_path[0]
if sudoable and expand_path == '~' and self._play_context.become and self._play_context.become_user:
expand_path = '~%s' % self._play_context.become_user
cmd = self._connection._shell.expand_user(expand_path) cmd = self._connection._shell.expand_user(expand_path)
data = self._low_level_execute_command(cmd, sudoable=False) data = self._low_level_execute_command(cmd, sudoable=False)
initial_fragment = data['stdout'].strip().splitlines()[-1] initial_fragment = data['stdout'].strip().splitlines()[-1]