ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-22 12:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Update bare exceptions to specify Exception.

Browse source 
This will keep us from accidentally catching program-exiting exceptions
like KeyboardInterupt and SystemExit.
This commit is contained in:
Toshio Kuratomi 2018-09-07 17:59:46 -07:00
commit 3fba006207
320 changed files with 659 additions and 656 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/modules/storage/purestorage/purefa_hg.py
View file

@ -125,7 +125,7 @@ def make_hostgroup(module, array):
try:
array.create_hgroup(module.params['hostgroup'])
except:
except Exception:
changed = False
if module.params['host']:
array.set_hgroup(module.params['hostgroup'], hostlist=module.params['host'])
@ -146,7 +146,7 @@ def update_hostgroup(module, array):
try:
array.set_hgroup(module.params['hostgroup'], addhostlist=new_hosts)
changed = True
except:
except Exception:
module.fail_josn(msg='Failed to add host(s) to hostgroup')
if module.params['volume']:
if volumes:
@ -156,14 +156,14 @@ def update_hostgroup(module, array):
try:
array.connect_hgroup(module.params['hostgroup'], cvol)
changed = True
except:
except Exception:
changed = False
else:
for cvol in module.params['volume']:
try:
array.connect_hgroup(module.params['hostgroup'], cvol)
changed = True
except:
except Exception:
changed = False
else:
if module.params['host']:
@ -172,7 +172,7 @@ def update_hostgroup(module, array):
try:
array.set_hgroup(module.params['hostgroup'], remhostlist=old_hosts)
changed = True
except:
except Exception:
changed = False
if module.params['volume']:
old_volumes = list(set(module.params['volume']).difference(set([vol['name'] for vol in volumes])))
@ -180,7 +180,7 @@ def update_hostgroup(module, array):
try:
array.disconnect_hgroup(module.params['hostgroup'], cvol)
changed = True
except:
except Exception:
changed = False
module.exit_json(changed=changed)
@ -193,18 +193,18 @@ def delete_hostgroup(module, array):
for vol in vols:
try:
array.disconnect_hgroup(module.params['hostgroup'], vol["vol"])
except:
except Exception:
changed = False
host = array.get_hgroup(module.params['hostgroup'])
try:
array.set_hgroup(module.params['hostgroup'], remhostlist=host['hosts'])
try:
array.delete_hgroup(module.params['hostgroup'])
except:
except Exception:
changed = False
except:
except Exception:
changed = False
except:
except Exception:
changed = False
module.exit_json(changed=changed)
@ -231,14 +231,14 @@ def main():
try:
for hst in module.params['host']:
array.get_host(hst)
except:
except Exception:
module.fail_json(msg='Host {0} not found'.format(hst))
if module.params['volume']:
try:
for vol in module.params['volume']:
array.get_volume(vol)
except:
except Exception:
module.fail_json(msg='Volume {0} not found'.format(vol))
if hostgroup and state == 'present':