internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid loading vars on unspecified basedir (cwd) (#42067)

Browse Source 
* avoid loading vars on unspecified basedir (cwd)
This commit is contained in:
Brian Coca
2018-06-29 19:45:38 -04:00
committed by Toshio Kuratomi
parent c3134ce6e2
commit de0e11c0d5
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ansible/cli/__init__.py
View File

@@ -664,7 +664,7 @@ class CLI(with_metaclass(ABCMeta, object)):
ansible_versions[counter] = 0
try:
ansible_versions[counter] = int(ansible_versions[counter])
except:
except Exception:
pass
if len(ansible_versions) < 3:
for counter in range(len(ansible_versions), 3):
@@ -809,6 +809,12 @@ class CLI(with_metaclass(ABCMeta, object)):
# the code, ensuring a consistent view of global variables
variable_manager = VariableManager(loader=loader, inventory=inventory)
if hasattr(options, 'basedir'):
if options.basedir:
variable_manager.safe_basedir = True
else:
variable_manager.safe_basedir = True
# load vars from cli options
variable_manager.extra_vars = load_extra_vars(loader=loader, options=options)
variable_manager.options_vars = load_options_vars(options, CLI.version_info(gitinfo=False))