From 4bfffe813b8a5d346806b0fd84cf2d15efff2f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Moser?= Date: Thu, 30 Jun 2016 16:37:21 +0200 Subject: [PATCH] fix typo in get_exception(), extends fix #2502 (#2507) introduced with 9e277aabb033b3ec823b4a2db7c0f7e315eaaf0b --- lib/ansible/modules/extras/system/cronvar.py | 4 ++-- lib/ansible/modules/extras/system/crypttab.py | 2 +- lib/ansible/modules/extras/system/getent.py | 2 +- lib/ansible/modules/extras/system/gluster_volume.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ansible/modules/extras/system/cronvar.py b/lib/ansible/modules/extras/system/cronvar.py index 244bcd63da7..baa206888b8 100644 --- a/lib/ansible/modules/extras/system/cronvar.py +++ b/lib/ansible/modules/extras/system/cronvar.py @@ -150,7 +150,7 @@ class CronVar(object): self.lines = f.read().splitlines() f.close() except IOError: - e = get_exception + e = get_exception() # cron file does not exist return except: @@ -207,7 +207,7 @@ class CronVar(object): os.unlink(self.cron_file) return True except OSError: - e = get_exception + e = get_exception() # cron file does not exist return False except: diff --git a/lib/ansible/modules/extras/system/crypttab.py b/lib/ansible/modules/extras/system/crypttab.py index e8e0b5835f4..ea9698a12c2 100644 --- a/lib/ansible/modules/extras/system/crypttab.py +++ b/lib/ansible/modules/extras/system/crypttab.py @@ -130,7 +130,7 @@ def main(): crypttab = Crypttab(path) existing_line = crypttab.match(name) except Exception: - e = get_exception + e = get_exception() module.fail_json(msg="failed to open and parse crypttab file: %s" % e, **module.params) diff --git a/lib/ansible/modules/extras/system/getent.py b/lib/ansible/modules/extras/system/getent.py index ba0d0061460..995ba015141 100644 --- a/lib/ansible/modules/extras/system/getent.py +++ b/lib/ansible/modules/extras/system/getent.py @@ -114,7 +114,7 @@ def main(): try: rc, out, err = module.run_command(cmd) except Exception: - e = get_exception + e = get_exception() module.fail_json(msg=str(e)) msg = "Unexpected failure!" diff --git a/lib/ansible/modules/extras/system/gluster_volume.py b/lib/ansible/modules/extras/system/gluster_volume.py index 1f968271154..f7fae041299 100644 --- a/lib/ansible/modules/extras/system/gluster_volume.py +++ b/lib/ansible/modules/extras/system/gluster_volume.py @@ -150,7 +150,7 @@ def run_gluster(gargs, **kwargs): if rc != 0: module.fail_json(msg='error running gluster (%s) command (rc=%d): %s' % (' '.join(args), rc, out or err)) except Exception: - e = get_exception + e = get_exception() module.fail_json(msg='error running gluster (%s) command: %s' % (' '.join(args), str(e))) return out