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

Fixes #5159 `file` module: Don't catch `SystemExit`
pull/5310/head
jctanner 11 years ago
commit 53a3671df4

@ -234,8 +234,8 @@ def main():
if module.check_mode: if module.check_mode:
module.exit_json(changed=True) module.exit_json(changed=True)
shutil.rmtree(path, ignore_errors=False) shutil.rmtree(path, ignore_errors=False)
except: except Exception, e:
module.exit_json(msg="rmtree failed") module.fail_json(msg="rmtree failed: %s" % str(e))
else: else:
if module.check_mode: if module.check_mode:
module.exit_json(changed=True) module.exit_json(changed=True)

Loading…
Cancel
Save