Fix bin/ansible to not make a double traceback on python3 (#15972)

2016-06-02 18:49:22 +02:00 · 2016-06-02 18:49:22 +02:00 · f0023610e8
commit f0023610e8
parent 805e0ec529
1 changed files with 6 additions and 1 deletions
--- a/bin/ansible
+++ b/bin/ansible
@ -82,7 +82,12 @@ if __name__ == '__main__':
            else:
                raise AnsibleError("Unknown Ansible alias: %s" % me)
        except ImportError as e:
-            if e.message.endswith(' %s' % sub):
+            # ImportError members have changed in py3
+            if 'msg' in dir(e):
+                msg = e.msg
+            else:
+                msg = e.message
+            if msg.endswith(' %s' % sub):
                raise AnsibleError("Ansible sub-program not implemented: %s" % me)
            else:
                raise