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

Merge pull request #6057 from risaacson/issues_5914

Browse Source 
Copy action_plugin: encode content when dict.
This commit is contained in:
Michael DeHaan
2014-02-18 15:56:21 -05:00
parent 30611eaac5 1ac19cb981
commit b975ad7e1f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ansible/runner/action_plugins/copy.py
View File

@@ -23,6 +23,7 @@ import ansible.utils.template as template
from ansible import errors from ansible import errors
from ansible.runner.return_data import ReturnData from ansible.runner.return_data import ReturnData
import base64 import base64
import json
import stat import stat
import tempfile import tempfile
import pipes import pipes
@@ -71,7 +72,12 @@ class ActionModule(object):
# If content is defined make a temp file and write the content into it. # If content is defined make a temp file and write the content into it.
if content is not None: if content is not None:
try: try:
content_tempfile = self._create_content_tempfile(content) # If content comes to us as a dict it should be decoded json.
# We need to encode it back into a string to write it out.
if type(content) is dict:
content_tempfile = self._create_content_tempfile(json.dumps(content))
else:
content_tempfile = self._create_content_tempfile(content)
source = content_tempfile source = content_tempfile
except Exception, err: except Exception, err:
result = dict(failed=True, msg="could not write content temp file: %s" % err) result = dict(failed=True, msg="could not write content temp file: %s" % err)