Port mount to python3 and python 2.4 compatible syntax (#3678)

9 years ago · c1e40b73f7
parent f41a90eae4
commit c1e40b73f7
1 changed files with 4 additions and 2 deletions
--- a/system/mount.py
+++ b/system/mount.py
@ -310,7 +310,8 @@ def main():
            if os.path.exists(name):
                try:
                    os.rmdir(name)
-                except (OSError, IOError), e:
+                except (OSError, IOError):
+                    e = get_exception()
                    module.fail_json(msg="Error rmdir %s: %s" % (name, str(e)))

        module.exit_json(changed=changed, **args)
@ -330,7 +331,8 @@ def main():
            if not os.path.exists(name) and not module.check_mode:
                try:
                    os.makedirs(name)
-                except (OSError, IOError), e:
+                except (OSError, IOError):
+                    e = get_exception()
                    module.fail_json(msg="Error making dir %s: %s" % (name, str(e)))

        name, changed = set_mount(module, **args)