diff options
author | Brian Coca <brian.coca+git@gmail.com> | 2015-11-02 22:17:13 -0500 |
---|---|---|
committer | Brian Coca <brian.coca+git@gmail.com> | 2015-11-02 22:17:37 -0500 |
commit | 10fd717a4460fc23b5a9c97e4bc99126fa868e26 (patch) | |
tree | 95b9f6f42ba739120ce19f94ee54ff6cffed1f6f /bin/ansible | |
parent | a7d1a39b8138e0372c7bd0231f5c02a1d5285b4f (diff) | |
download | ansible-10fd717a4460fc23b5a9c97e4bc99126fa868e26.tar.gz |
narrow the scope of import error and make sure non - aliases to ansible get their own error
Diffstat (limited to 'bin/ansible')
-rwxr-xr-x | bin/ansible | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/bin/ansible b/bin/ansible index 7420c2cc30..60d2bf42cb 100755 --- a/bin/ansible +++ b/bin/ansible @@ -71,11 +71,15 @@ if __name__ == '__main__': mycli = getattr(__import__("ansible.cli.%s" % sub, fromlist=[myclass]), myclass) elif me == 'ansible': from ansible.cli.adhoc import AdHocCLI as mycli - - cli = mycli(sys.argv, display=display) - except (ImportError,NameError): - raise AnsibleError("Ansible sub-program not implemented: %s" % me) - + else: + raise AnsibleError("Unknown Ansible alias: %s" % me) + except ImportError as e: + if e.message.endswith(' %s' % sub): + raise AnsibleError("Ansible sub-program not implemented: %s" % me) + else: + raise + + cli = mycli(sys.argv, display=display) cli.parse() sys.exit(cli.run()) |