ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-25 06:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

ansible-config: add simple tests (#34900)

Browse source 
* Revert "Fix ansible-config with python3 (#34673)"

This reverts commit 2a9daaa45b.

* ansible-config: add simple tests

* Fix ansible-config with python3

* ansible-test: don't quote "unusual" characters
This commit is contained in:
Pilou 2018-01-17 15:33:33 +01:00 • committed by Adam Miller
commit 217ff4498c
5 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/cli/config.py
View file

@ -68,11 +68,11 @@ class ConfigCLI(CLI):
super(ConfigCLI, self).run()
if self.options.config_file:
self.config_file = to_bytes(unfrackpath(self.options.config_file, follow=False))
self.config_file = unfrackpath(self.options.config_file, follow=False)
self.config = ConfigManager(self.config_file)
else:
self.config = ConfigManager()
self.config_file = to_bytes(find_ini_config_file())
self.config_file = find_ini_config_file()
try:
if not os.path.exists(self.config_file):
raise AnsibleOptionsError("%s does not exist or is not accessible" % (self.config_file))

2
lib/ansible/config/manager.py
View file

@ -116,7 +116,7 @@ def get_config_type(cfile):
ftype = None
if cfile is not None:
ext = to_text(os.path.splitext(cfile)[-1])
ext = os.path.splitext(cfile)[-1]
if ext in ('.ini', '.cfg'):
ftype = 'ini'
elif ext in ('.yaml', '.yml'):