Merge pull request ansible#5162 from JensRantil/fix-corrupt-module-ou…

…tputs More don't catch `SystemExit`
whitmo · Dec 19, 2013 · 7d209ed · 7d209ed
1 parent 516d928
commit 7d209ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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())