cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix argument name to fail_json(), detail -> details

Browse source 
Also use to_native(e) instead of str(e) while here as str() itself
might throw an exception when handling non-ASCII chars as pointed
out by @abadger
This commit is contained in:
Jasper Lievisse Adriaanse 2017-01-18 21:15:38 +01:00 committed by Toshio Kuratomi
parent af1c2aa9b3
commit cc5080bc8a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/modules/web_infrastructure/jenkins_plugin.py
View file

@ -21,8 +21,8 @@
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.pycompat24 import get_exception from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.urls import fetch_url from ansible.module_utils.urls import fetch_url, url_argument_spec
from ansible.module_utils.urls import url_argument_spec from ansible.module_utils._text import to_native
import base64 import base64
import hashlib import hashlib
import json import json
@ -586,7 +586,7 @@ class JenkinsPlugin(object):
e = get_exception() e = get_exception()
self.module.fail_json( self.module.fail_json(
msg="Cannot close the tmp updates file %s." % updates_file, msg="Cannot close the tmp updates file %s." % updates_file,
detail=str(e)) details=to_native(e))
# Open the updates file # Open the updates file
try: try:
@ -595,7 +595,7 @@ class JenkinsPlugin(object):
e = get_exception() e = get_exception()
self.module.fail_json( self.module.fail_json(
msg="Cannot open temporal updates file.", msg="Cannot open temporal updates file.",
details=str(e)) details=to_native(e))
i = 0 i = 0
for line in f: for line in f:
@ -658,7 +658,7 @@ class JenkinsPlugin(object):
e = get_exception() e = get_exception()
self.module.fail_json( self.module.fail_json(
msg='Cannot close the temporal plugin file %s.' % tmp_f, msg='Cannot close the temporal plugin file %s.' % tmp_f,
details=str(e)) details=to_native(e))
# Move the file onto the right place # Move the file onto the right place
self.module.atomic_move(tmp_f, f) self.module.atomic_move(tmp_f, f)
@ -785,7 +785,7 @@ def main():
e = get_exception() e = get_exception()
module.fail_json( module.fail_json(
msg='Cannot convert %s to float.' % module.params['timeout'], msg='Cannot convert %s to float.' % module.params['timeout'],
details=str(e)) details=to_native(e))
# Set version to latest if state is latest # Set version to latest if state is latest
if module.params['state'] == 'latest': if module.params['state'] == 'latest':