diff options
author | Brian Coca <brian.coca+git@gmail.com> | 2015-11-02 12:46:04 -0500 |
---|---|---|
committer | Brian Coca <brian.coca+git@gmail.com> | 2015-11-02 12:46:33 -0500 |
commit | 56a2412dc2da760d0f481b16eba88556d9b26fda (patch) | |
tree | 7fd3159b54dd4013b8f642f4afda336fc756bb6d /bin | |
parent | 3c1fe28bed86b2bcb48f8773f426494f6115cf64 (diff) | |
download | ansible-56a2412dc2da760d0f481b16eba88556d9b26fda.tar.gz |
now correctly traps unimplemented symlinks as subprograms
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/ansible | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/ansible b/bin/ansible index 70e6863f6b..085a8e0f4e 100755 --- a/bin/ansible +++ b/bin/ansible @@ -74,12 +74,13 @@ if __name__ == '__main__': elif me == 'ansible-galaxy': from ansible.cli.galaxy import GalaxyCLI as mycli - cli = mycli(sys.argv, display=display) - if cli: - cli.parse() - sys.exit(cli.run()) - else: - raise AnsibleError("Program not implemented: %s" % me) + try: + cli = mycli(sys.argv, display=display) + except NameError: + raise AnsibleError("Ansible sub-program not implemented: %s" % me) + + cli.parse() + sys.exit(cli.run()) except AnsibleOptionsError as e: cli.parser.print_help() |