internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

template: change to pass along the correct template path (#35027)

Browse Source 
* template: change to pass along the correct template path

* standardise tmp path behaviour

* removed if condition as it should not be needed
This commit is contained in:
Jordan Borean
2018-01-19 09:51:42 +10:00
committed by GitHub
parent 676ce74cbf
commit 389f4ef1fb
12 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ansible/plugins/action/unarchive.py
View File

@@ -37,6 +37,8 @@ class ActionModule(ActionBase):
result = super(ActionModule, self).run(tmp, task_vars)
tmp = self._connection._shell.tempdir
source = self._task.args.get('src', None)
dest = self._task.args.get('dest', None)
remote_src = boolean(self._task.args.get('remote_src', False), strict=False)
@@ -83,7 +85,7 @@ class ActionModule(ActionBase):
if not remote_src:
# transfer the file to a remote tmp location
tmp_src = self._connection._shell.join_path(self._connection._shell.tempdir, 'source')
tmp_src = self._connection._shell.join_path(tmp, 'source')
self._transfer_file(source, tmp_src)
# handle diff mode client side
@@ -91,7 +93,7 @@ class ActionModule(ActionBase):
if not remote_src:
# fix file permissions when the copy is done as a different user
self._fixup_perms2((self._connection._shell.tempdir, tmp_src))
self._fixup_perms2((tmp, tmp_src))
# Build temporary module_args.
new_module_args = self._task.args.copy()
new_module_args.update(
@@ -119,5 +121,5 @@ class ActionModule(ActionBase):
except AnsibleAction as e:
result.update(e.result)
finally:
self._remove_tmp_path(self._connection._shell.tempdir)
self._remove_tmp_path(tmp)
return result