cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Michael Scherer 2016-06-02 18:49:22 +02:00 committed by Toshio Kuratomi
parent 805e0ec529
commit f0023610e8
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/ansible
View file

@ -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