Fixes --version in ansible-galaxy cli

This commit is contained in:
Andrea Tartaglia 2019-10-17 14:21:08 +01:00 committed by Toshio Kuratomi
parent 81d49c38f8
commit 202ad4f89a
2 changed files with 4 additions and 1 deletions

View file

@ -44,7 +44,7 @@ class GalaxyCLI(CLI):
def __init__(self, args):
# Inject role into sys.argv[1] as a backwards compatibility step
if len(args) > 1 and args[1] not in ['-h', '--help'] and 'role' not in args and 'collection' not in args:
if len(args) > 1 and args[1] not in ['-h', '--help', '--version'] and 'role' not in args and 'collection' not in args:
# TODO: Should we add a warning here and eventually deprecate the implicit role subcommand choice
# Remove this in Ansible 2.13 when we also remove -v as an option on the root parser for ansible-galaxy.
idx = 2 if args[1].startswith('-v') else 1

View file

@ -6,6 +6,9 @@ ansible-playbook setup.yml "$@"
trap 'ansible-playbook cleanup.yml' EXIT
# Very simple version test
ansible-galaxy --version
# Need a relative custom roles path for testing various scenarios of -p
galaxy_relative_rolespath="my/custom/roles/path"