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

Remove deprecated get_exception API

Browse Source 
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde
2017-12-26 08:33:21 +05:30
committed by Brian Coca
parent caefe31125
commit 6bd0fbb63c
42 changed files with 284 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ansible/modules/files/acl.py
View File

@@ -130,7 +130,7 @@ acl:
import os
from ansible.module_utils.basic import AnsibleModule, get_platform
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils._text import to_native
def split_entry(entry):
@@ -225,9 +225,8 @@ def run_acl(module, cmd, check_rc=True):
try:
(rc, out, err) = module.run_command(' '.join(cmd), check_rc=check_rc)
except Exception:
e = get_exception()
module.fail_json(msg=e.strerror)
except Exception as e:
module.fail_json(msg=to_native(e))
lines = []
for l in out.splitlines():
@@ -355,5 +354,6 @@ def main():
module.exit_json(changed=changed, msg=msg, acl=acl)
if __name__ == '__main__':
main()

8
lib/ansible/modules/files/xattr.py
View File

@@ -77,7 +77,7 @@ import re
# import module snippets
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils._text import to_native
def get_xattr_keys(module, path, follow):
@@ -134,9 +134,8 @@ def _run_xattr(module, cmd, check_rc=True):
try:
(rc, out, err) = module.run_command(' '.join(cmd), check_rc=check_rc)
except Exception:
e = get_exception()
module.fail_json(msg="%s!" % e.strerror)
except Exception as e:
module.fail_json(msg="%s!" % to_native(e))
# result = {'raw': out}
result = {}
@@ -210,5 +209,6 @@ def main():
module.exit_json(changed=changed, msg=msg, xattr=res)
if __name__ == '__main__':
main()