From 8f2580fc988dbb710525786a90fea9e71f6a39ae Mon Sep 17 00:00:00 2001 From: Jens Rantil Date: Wed, 4 Dec 2013 13:56:57 +0100 Subject: [PATCH 1/2] module(apt_key): don't catch `SystemExit` If we do this, we risk outputting two JSON payloads, which will be unparsable. --- library/packaging/apt_key | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/packaging/apt_key b/library/packaging/apt_key index 17b52888d4..dee73762c6 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()) From 153df0a23ee169bf20c4b8c5b6356739286b74e4 Mon Sep 17 00:00:00 2001 From: Jens Rantil Date: Wed, 4 Dec 2013 13:55:16 +0100 Subject: [PATCH 2/2] module(nagios): don't catch `SystemExit` If we do this, we risk outputting two JSON payloads, which will be unparsable. --- library/monitoring/nagios | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/monitoring/nagios b/library/monitoring/nagios index a66583b0c6..9219766b86 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') ##################################################################