This is an automated email from the ASF dual-hosted git repository. tvb pushed a commit to branch tristan/variables-refactor in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 8f27d432f50ff7588f80db305aa466f44e993375 Author: Tristan van Berkom <[email protected]> AuthorDate: Fri Jul 17 17:18:18 2020 +0900 element.py: Pass ScalarNode to Variable.subst() when substituting the whitelists --- src/buildstream/element.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/buildstream/element.py b/src/buildstream/element.py index d152630..6b98ae9 100644 --- a/src/buildstream/element.py +++ b/src/buildstream/element.py @@ -2819,8 +2819,8 @@ class Element(Plugin): # If this ever changes, things will go wrong unexpectedly. if not self.__whitelist_regex: bstdata = self.get_public_data("bst") - whitelist = bstdata.get_str_list("overlap-whitelist", default=[]) - whitelist_expressions = [utils._glob2re(self.__variables.subst(exp.strip())) for exp in whitelist] + whitelist = bstdata.get_sequence("overlap-whitelist", default=[]) + whitelist_expressions = [utils._glob2re(self.__variables.subst(node)) for node in whitelist] expression = "^(?:" + "|".join(whitelist_expressions) + ")$" self.__whitelist_regex = re.compile(expression) return self.__whitelist_regex.match(os.path.join(os.sep, path))
