Ensure --version works with non-ascii project path (#66624)

Fixes #66617
This commit is contained in:
Martin Krizek 2020-05-29 20:42:44 +02:00 committed by GitHub
parent 1dd8247fba
commit 3606dcfe65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 1 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- Ensure that ``--version`` works with non-ascii ansible project paths (https://github.com/ansible/ansible/issues/66617)

View file

@ -231,7 +231,7 @@ def find_ini_config_file(warnings=None):
if os.path.exists(cwd_cfg):
warn_cmd_public = True
else:
potential_paths.append(cwd_cfg)
potential_paths.append(to_text(cwd_cfg, errors='surrogate_or_strict'))
except OSError:
# If we can't access cwd, we'll simply skip it as a possible config source
pass

View file

@ -0,0 +1,2 @@
[defaults]
library=~/.ansible/plugins/modules:/usr/share/ansible/plugins/modules:.

View file

@ -5,3 +5,9 @@ set -eux
ansible-playbook unicode.yml -i inventory -v -e 'extra_var=café' "$@"
# Test the start-at-task flag #9571
ANSIBLE_HOST_PATTERN_MISMATCH=warning ansible-playbook unicode.yml -i inventory -v --start-at-task '*¶' -e 'start_at_task=True' "$@"
# Test --version works with non-ascii ansible project paths #66617
# Unset these so values from the project dir are used
unset ANSIBLE_CONFIG
unset ANSIBLE_LIBRARY
pushd křížek-ansible-project && ansible --version; popd