diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-07-02 16:06:45 +0100 |
|---|---|---|
| committer | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-07-03 16:18:30 +0100 |
| commit | 35fad402ef5d75d25589fdfd6cddde0306c263aa (patch) | |
| tree | 358dce8d3146891e18b0eda378ad56158416b393 /src/buildstream/_project.py | |
| parent | 382712aec8f6c0a1a820194ee6917b9f8195ab1f (diff) | |
| download | buildstream-bschubert/new-node-compose.tar.gz | |
_yaml: Move 'node_composite' to a method on 'MappingNode'bschubert/new-node-compose
- Also take care of node_composite_move in the same way.
- Adapt all calling places
Diffstat (limited to 'src/buildstream/_project.py')
| -rw-r--r-- | src/buildstream/_project.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py index ba3b92207..1a22e0b06 100644 --- a/src/buildstream/_project.py +++ b/src/buildstream/_project.py @@ -570,7 +570,7 @@ class Project(): raise pre_config_node = self._default_config_node.copy() - _yaml.composite(pre_config_node, self._project_conf) + self._project_conf.composite(pre_config_node) # Assert project's format version early, before validating toplevel keys format_version = pre_config_node.get_int('format-version') @@ -616,7 +616,7 @@ class Project(): project_conf_first_pass = self._project_conf.copy() self._project_includes.process(project_conf_first_pass, only_local=True) config_no_include = self._default_config_node.copy() - _yaml.composite(config_no_include, project_conf_first_pass) + project_conf_first_pass.composite(config_no_include) self._load_pass(config_no_include, self.first_pass_config, ignore_unknown=True) @@ -640,7 +640,7 @@ class Project(): project_conf_second_pass = self._project_conf.copy() self._project_includes.process(project_conf_second_pass) config = self._default_config_node.copy() - _yaml.composite(config, project_conf_second_pass) + project_conf_second_pass.composite(config) self._load_pass(config, self.config) |