diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2016-09-03 11:24:53 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2016-09-03 11:24:53 -0700 |
| commit | 40a9425e7a70f26828f1e23aef4645fbd931552a (patch) | |
| tree | 09e000f635232c608a0d6b7669a3c7e23fccc355 | |
| parent | 9ad77a5398b81bd36e103ef5319d49a9a3fb9b39 (diff) | |
| download | ansible-fix-copy-pipelining.tar.gz | |
Fix pipelining with copy module.fix-copy-pipelining
The fix to always clean temp directories broke pipelining with
the copy module. This reverts part of the change in
a5d79a39d51a256937d6e5742befa169629b7caf
| -rw-r--r-- | lib/ansible/plugins/action/copy.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/plugins/action/copy.py b/lib/ansible/plugins/action/copy.py index 68b60d35da..58a892da5c 100644 --- a/lib/ansible/plugins/action/copy.py +++ b/lib/ansible/plugins/action/copy.py @@ -247,7 +247,7 @@ class ActionModule(ActionBase): if 'content' in new_module_args: del new_module_args['content'] - module_return = self._execute_module(module_name='copy', module_args=new_module_args, task_vars=task_vars, tmp=tmp, delete_remote_tmp=delete_remote_tmp) + module_return = self._execute_module(module_name='copy', module_args=new_module_args, task_vars=task_vars, delete_remote_tmp=delete_remote_tmp) module_executed = True else: @@ -272,7 +272,7 @@ class ActionModule(ActionBase): ) # Execute the file module. - module_return = self._execute_module(module_name='file', module_args=new_module_args, task_vars=task_vars, tmp=tmp, delete_remote_tmp=delete_remote_tmp) + module_return = self._execute_module(module_name='file', module_args=new_module_args, task_vars=task_vars, delete_remote_tmp=delete_remote_tmp) module_executed = True if not module_return.get('checksum'): |