internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed modules/system py files for 2.4 to 3.5 exceptions (#2367)

Browse Source
This commit is contained in:
Chris Weber
2016-06-03 06:23:55 -07:00
committed by Matt Clay
parent 868a4584a4
commit 891245c6f6
12 changed files with 95 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/modules/extras/system/gluster_volume.py
View File

@@ -135,6 +135,8 @@ EXAMPLES = """
import shutil
import time
import socket
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.basic import *
glusterbin = ''
@@ -147,7 +149,8 @@ def run_gluster(gargs, **kwargs):
rc, out, err = module.run_command(args, **kwargs)
if rc != 0:
module.fail_json(msg='error running gluster (%s) command (rc=%d): %s' % (' '.join(args), rc, out or err))
except Exception, e:
except Exception:
e = get_exception
module.fail_json(msg='error running gluster (%s) command: %s' % (' '.join(args), str(e)))
return out
@@ -456,6 +459,4 @@ def main():
module.exit_json(changed=changed, ansible_facts=facts)
# import module snippets
from ansible.module_utils.basic import *
main()