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

Merge pull request #5536 from jeromew/ansible_ssh_alt

Make sure 'tmp' is in the remote tmp dirname to ensure correct cleanup
This commit is contained in:
jctanner 2014-01-08 06:18:27 -08:00
commit d9928539c1

View file

@ -868,7 +868,7 @@ class Runner(object):
def _make_tmp_path(self, conn): def _make_tmp_path(self, conn):
''' make and return a temporary path on a remote box ''' ''' make and return a temporary path on a remote box '''
basefile = 'ansible-%s-%s' % (time.time(), random.randint(0, 2**48)) basefile = 'ansible-tmp-%s-%s' % (time.time(), random.randint(0, 2**48))
basetmp = os.path.join(C.DEFAULT_REMOTE_TMP, basefile) basetmp = os.path.join(C.DEFAULT_REMOTE_TMP, basefile)
if self.sudo and self.sudo_user != 'root' and basetmp.startswith('$HOME'): if self.sudo and self.sudo_user != 'root' and basetmp.startswith('$HOME'):
basetmp = os.path.join('/tmp', basefile) basetmp = os.path.join('/tmp', basefile)