From 202ad4f89ae56c63c8e29e4d45c78b648e27cfd8 Mon Sep 17 00:00:00 2001 From: Andrea Tartaglia Date: Thu, 17 Oct 2019 14:21:08 +0100 Subject: [PATCH] Fixes --version in ansible-galaxy cli --- lib/ansible/cli/galaxy.py | 2 +- test/integration/targets/ansible-galaxy/runme.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py index 4963b6e7e59763..ffe2074093f658 100644 --- a/lib/ansible/cli/galaxy.py +++ b/lib/ansible/cli/galaxy.py @@ -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 diff --git a/test/integration/targets/ansible-galaxy/runme.sh b/test/integration/targets/ansible-galaxy/runme.sh index 63dc2e9917a4b2..1082bd22f40149 100755 --- a/test/integration/targets/ansible-galaxy/runme.sh +++ b/test/integration/targets/ansible-galaxy/runme.sh @@ -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"