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/testing/runcli.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/testing/runcli.py')
| -rw-r--r-- | src/buildstream/testing/runcli.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buildstream/testing/runcli.py b/src/buildstream/testing/runcli.py index ad8a09a33..016f8a83a 100644 --- a/src/buildstream/testing/runcli.py +++ b/src/buildstream/testing/runcli.py @@ -574,7 +574,7 @@ class CliIntegration(Cli): project_config = _yaml.load(temp_project) - _yaml.composite(base_config, project_config) + project_config.composite(base_config) _yaml.roundtrip_dump(base_config, project_filename) |