diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildstream/element.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py index 18e42c722..09b0e4c06 100644 --- a/src/buildstream/element.py +++ b/src/buildstream/element.py @@ -296,8 +296,8 @@ class Element(Plugin): self.__env_nocache = nocache # Grab public domain data declared for this instance - unexpanded_public = self.__extract_public(meta) - self.__public = self.__expand_splits(unexpanded_public) + self.__public = self.__extract_public(meta) + self.__variables.expand(self.__public) self.__dynamic_public = None # Collect the composited element configuration and @@ -2745,18 +2745,6 @@ class Element(Plugin): return element_public - # Expand the splits in the public data using the Variables in the element - def __expand_splits(self, element_public): - element_bst = element_public.get_mapping("bst", default={}) - element_splits = element_bst.get_mapping("split-rules", default={}) - - # Resolve any variables in the public split rules directly - for domain, splits in element_splits.items(): - splits = [self.__variables.subst(split.strip()) for split in splits.as_str_list()] - element_splits[domain] = splits - - return element_public - def __init_splits(self): bstdata = self.get_public_data("bst") splits = bstdata.get_mapping("split-rules") |