diff options
| author | Benjamin Schubert <contact@benschubert.me> | 2019-10-15 11:51:54 +0100 |
|---|---|---|
| committer | Benjamin Schubert <contact@benschubert.me> | 2019-10-16 13:52:55 +0100 |
| commit | 0cc53801868a0b85c81bb68579153a04cb7a5faf (patch) | |
| tree | ef1355c6e0fae77ae60e23a614c95391dded5627 /src/buildstream/_project.py | |
| parent | 1b92d90b5b95241e9c44d02a63713ca2de8a98f4 (diff) | |
| download | buildstream-0cc53801868a0b85c81bb68579153a04cb7a5faf.tar.gz | |
_options/option.py: Pass the node instead of the str to 'transform'
This is in order to consolidate how we substitute variables.
_project: use 'node_subst_vars' instead of '_subst_list'
as the first one expects a node.
Diffstat (limited to 'src/buildstream/_project.py')
| -rw-r--r-- | src/buildstream/_project.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py index 7ba93bba4..54a011e0d 100644 --- a/src/buildstream/_project.py +++ b/src/buildstream/_project.py @@ -789,7 +789,7 @@ class Project(): output.options.load(options_node) if self.junction: # load before user configuration - output.options.load_yaml_values(self.junction.options, transform=self.junction._subst_string) + output.options.load_yaml_values(self.junction.options, transform=self.junction.node_subst_vars) # Collect option values specified in the user configuration overrides = self._context.get_overrides(self.name) |