From cb7ad3f484cebee17c401ef675229dac13e860d4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 14 Mar 2017 18:01:43 +0000 Subject: [PATCH] Fix the pep8 fixing 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 --- vars_plugins/override_folder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars_plugins/override_folder.py b/vars_plugins/override_folder.py index 92995f8..e6661fb 100644 --- a/vars_plugins/override_folder.py +++ b/vars_plugins/override_folder.py @@ -39,8 +39,8 @@ def vars_files_loading(folder, name, matched=False): except OSError: return files for f in candidates: - if os.path.basename(f) in [name, name + ".yml", name + ".yaml"] - or matched: + if (os.path.basename(f) in [name, name + ".yml", name + ".yaml"] + or matched): if os.path.isfile(f): files.append(f) elif os.path.isdir(f):