summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjctanner <tanner.jc@gmail.com>2013-12-16 12:17:33 -0800
committerJames Tanner <tanner.jc@gmail.com>2013-12-18 20:25:16 -0500
commit516d9287820f04cad2ac44c5dd8ce31aac312253 (patch)
tree319d68bc27a26862992a96bdeb68228dfb14a4f6
parent00fb62579dea3b0ab23f4fbf7d52da2c91a18fb0 (diff)
downloadansible-516d9287820f04cad2ac44c5dd8ce31aac312253.tar.gz
Merge pull request #5160 from JensRantil/fix-issue-5159
Fixes #5159 `file` module: Don't catch `SystemExit`
-rw-r--r--library/files/file4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/files/file b/library/files/file
index d30e3716bf..d0b903d718 100644
--- a/library/files/file
+++ b/library/files/file
@@ -234,8 +234,8 @@ def main():
if module.check_mode:
module.exit_json(changed=True)
shutil.rmtree(path, ignore_errors=False)
- except:
- module.exit_json(msg="rmtree failed")
+ except Exception, e:
+ module.fail_json(msg="rmtree failed: %s" % str(e))
else:
if module.check_mode:
module.exit_json(changed=True)