From 705316e303ef13848bb1d544a20d8996f5ff3c1e Mon Sep 17 00:00:00 2001 From: Jens Rantil Date: Wed, 4 Dec 2013 13:13:49 +0100 Subject: [PATCH 1/3] `file` module: Don't catch `SystemExit` This fixes issue #5159. --- library/files/file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/files/file b/library/files/file index 134b5284efd..c68a2bcfa6d 100644 --- a/library/files/file +++ b/library/files/file @@ -234,7 +234,7 @@ def main(): if module.check_mode: module.exit_json(changed=True) shutil.rmtree(path, ignore_errors=False) - except: + except Exception, e: module.exit_json(msg="rmtree failed") else: if module.check_mode: From f4aa808b8d1ff43fa8b978eb56da052d70fe194c Mon Sep 17 00:00:00 2001 From: Jens Rantil Date: Fri, 13 Dec 2013 21:33:19 +0100 Subject: [PATCH 2/3] module(file): state what went wrong on exception --- library/files/file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/files/file b/library/files/file index c68a2bcfa6d..55249e62fbd 100644 --- a/library/files/file +++ b/library/files/file @@ -235,7 +235,7 @@ def main(): module.exit_json(changed=True) shutil.rmtree(path, ignore_errors=False) except Exception, e: - module.exit_json(msg="rmtree failed") + module.exit_json(msg="rmtree failed: %s" % str(e)) else: if module.check_mode: module.exit_json(changed=True) From 1b6019f6e091c64ec50739947a661428294c354e Mon Sep 17 00:00:00 2001 From: Jens Rantil Date: Fri, 13 Dec 2013 21:34:02 +0100 Subject: [PATCH 3/3] module(file): Fail instead of exit on exception --- library/files/file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/files/file b/library/files/file index 55249e62fbd..8dcead1b402 100644 --- a/library/files/file +++ b/library/files/file @@ -235,7 +235,7 @@ def main(): module.exit_json(changed=True) shutil.rmtree(path, ignore_errors=False) except Exception, e: - module.exit_json(msg="rmtree failed: %s" % str(e)) + module.fail_json(msg="rmtree failed: %s" % str(e)) else: if module.check_mode: module.exit_json(changed=True)