diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2013-12-18 05:13:34 -0800 |
|---|---|---|
| committer | James Tanner <tanner.jc@gmail.com> | 2013-12-18 20:25:16 -0500 |
| commit | 7d209edae28f48dc2e0da02f0adcad724bb855c3 (patch) | |
| tree | 1728283934daa70fc93e8b066be3d431f67a1d91 | |
| parent | 516d9287820f04cad2ac44c5dd8ce31aac312253 (diff) | |
| download | ansible-7d209edae28f48dc2e0da02f0adcad724bb855c3.tar.gz | |
Merge pull request #5162 from JensRantil/fix-corrupt-module-outputs
More don't catch `SystemExit`
| -rw-r--r-- | library/monitoring/nagios | 2 | ||||
| -rw-r--r-- | library/packaging/apt_key | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/monitoring/nagios b/library/monitoring/nagios index a9100ad51f..ad1dbfe397 100644 --- a/library/monitoring/nagios +++ b/library/monitoring/nagios @@ -214,7 +214,7 @@ def main(): m = int(minutes) if not isinstance(m, types.IntType): module.fail_json(msg='minutes must be a number') - except: + except Exception: module.fail_json(msg='invalid entry for minutes') ################################################################## diff --git a/library/packaging/apt_key b/library/packaging/apt_key index 764eed6b8e..584bbab6b1 100644 --- a/library/packaging/apt_key +++ b/library/packaging/apt_key @@ -138,7 +138,7 @@ def download_key(module, url): module.fail_json("error connecting to download key from url") data = connection.read() return data - except: + except Exception: module.fail_json(msg="error getting key id from url", traceback=format_exc()) |