diff options
author | Benno Joy <benno@ansible.com> | 2014-07-23 14:50:16 +0000 |
---|---|---|
committer | James Cammarata <jimi@sngx.net> | 2014-07-24 21:57:53 -0500 |
commit | b2b04ad8cbe43674bc859a1d6cc6ef11f061dbe3 (patch) | |
tree | f8cae188308d260de184a6b4940b86e85a2806be | |
parent | f88bf574630db3daac1318fa7c65465f5d58a964 (diff) | |
download | ansible-b2b04ad8cbe43674bc859a1d6cc6ef11f061dbe3.tar.gz |
fix for unarchive 8257
-rw-r--r-- | lib/ansible/runner/action_plugins/unarchive.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ansible/runner/action_plugins/unarchive.py b/lib/ansible/runner/action_plugins/unarchive.py index c943cab514..1596425779 100644 --- a/lib/ansible/runner/action_plugins/unarchive.py +++ b/lib/ansible/runner/action_plugins/unarchive.py @@ -78,7 +78,12 @@ class ActionModule(object): if copy: if self.runner.sudo and self.runner.sudo_user != 'root': self.runner._low_level_exec_command(conn, "chmod a+r %s" % tmp_src, tmp) - module_args = "%s src=%s original_basename=%s" % (module_args, pipes.quote(tmp_src), pipes.quote(os.path.basename(source))) + # Build temporary module_args. + new_module_args = dict( + src=tmp_src, + original_basename=os.path.basename(source), + ) + module_args = utils.merge_module_args(module_args, new_module_args) else: module_args = "%s original_basename=%s" % (module_args, pipes.quote(os.path.basename(source))) return self.runner._execute_module(conn, tmp, 'unarchive', module_args, inject=inject, complex_args=complex_args) |