openstack/ansible-config_template
Code Issues Proposed changes

Fix the pep8 fixing

Browse Source 
First patchset for the override_folder worked functionally but
failed at pep8. I fixed the pep8 and broke the functionality at
the same time.

This should fix it.

Change-Id: I40542695c72e5be7799422f265f00c0b6d68ef0e
This commit is contained in:
Jean-Philippe Evrard 2017-03-14 18:01:43 +00:00
parent 77bbd15bdb
commit cb7ad3f484
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vars_plugins/override_folder.py
View File

@ -39,8 +39,8 @@ def vars_files_loading(folder, name, matched=False):
except OSError: except OSError:
return files return files
for f in candidates: for f in candidates:
if os.path.basename(f) in [name, name + ".yml", name + ".yaml"] if (os.path.basename(f) in [name, name + ".yml", name + ".yaml"]
or matched: or matched):
if os.path.isfile(f): if os.path.isfile(f):
files.append(f) files.append(f)
elif os.path.isdir(f): elif os.path.isdir(f):