Merge pull request #5160 from JensRantil/fix-issue-5159

Fixes #5159 `file` module: Don't catch `SystemExit`
2013-12-16 12:17:33 -08:00 · 2013-12-16 12:17:33 -08:00 · 69c162f556
commit 69c162f556
parent 8b925e93e6 38d0df65d8
1 changed files with 2 additions and 2 deletions
--- a/files/file
+++ b/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)