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

Merge pull request #5162 from JensRantil/fix-corrupt-module-outputs

Browse source 
More don't catch `SystemExit`
This commit is contained in:
Michael DeHaan 2013-12-18 05:13:34 -08:00
commit 3f81c3c416
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/monitoring/nagios
View file

@ -214,7 +214,7 @@ def main():
m = int(minutes) m = int(minutes)
if not isinstance(m, types.IntType): if not isinstance(m, types.IntType):
module.fail_json(msg='minutes must be a number') module.fail_json(msg='minutes must be a number')
except: except Exception:
module.fail_json(msg='invalid entry for minutes') module.fail_json(msg='invalid entry for minutes')
################################################################## ##################################################################

2
library/packaging/apt_key
View file

@ -138,7 +138,7 @@ def download_key(module, url):
module.fail_json("error connecting to download key from url") module.fail_json("error connecting to download key from url")
data = connection.read() data = connection.read()
return data return data
except: except Exception:
module.fail_json(msg="error getting key id from url", traceback=format_exc()) module.fail_json(msg="error getting key id from url", traceback=format_exc())