From 40a9425e7a70f26828f1e23aef4645fbd931552a Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Sat, 3 Sep 2016 11:24:53 -0700 Subject: Fix pipelining with copy module. The fix to always clean temp directories broke pipelining with the copy module. This reverts part of the change in a5d79a39d51a256937d6e5742befa169629b7caf --- lib/ansible/plugins/action/copy.py | 4 ++-- 1 file 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'): -- cgit v1.2.1