Merge pull request #11577 from srvg/yaml_file_extensions
Use YAML_FILENAME_EXTENSIONS for vars files.
This commit is contained in:
commit
e0632cb9a4
1 changed files with 3 additions and 3 deletions
|
@ -315,11 +315,11 @@ class VariableManager:
|
||||||
file_name, ext = os.path.splitext(path)
|
file_name, ext = os.path.splitext(path)
|
||||||
data = None
|
data = None
|
||||||
if not ext:
|
if not ext:
|
||||||
for ext in ('', '.yml', '.yaml'):
|
for ext in C.YAML_FILENAME_EXTENSIONS:
|
||||||
new_path = path + ext
|
new_path = path + ext
|
||||||
if loader.path_exists(new_path):
|
if loader.path_exists(new_path):
|
||||||
data = loader.load_from_file(new_path)
|
data = loader.load_from_file(new_path)
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
if loader.path_exists(path):
|
if loader.path_exists(path):
|
||||||
data = loader.load_from_file(path)
|
data = loader.load_from_file(path)
|
||||||
|
|
Loading…
Reference in a new issue