Merge pull request #9082 from mscherer/fix9080/file_not_working_py24

Make file module work on python 2.4, fix #9080
This commit is contained in:
Michael DeHaan 2014-09-21 19:18:44 -04:00
commit 062cc9bd04

View file

@ -339,7 +339,7 @@ def main():
module.fail_json(msg='Cannot touch other than files and directories') module.fail_json(msg='Cannot touch other than files and directories')
try: try:
module.set_fs_attributes_if_different(file_args, True) module.set_fs_attributes_if_different(file_args, True)
except SystemExit as e: except SystemExit, e:
if e.code: if e.code:
# We take this to mean that fail_json() was called from # We take this to mean that fail_json() was called from
# somewhere in basic.py # somewhere in basic.py