diff options
author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-07-02 16:06:45 +0100 |
---|---|---|
committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-15 14:14:03 +0000 |
commit | 673f8f7fa761d61d7792d91fa2ef9d2595ad9f05 (patch) | |
tree | 7379ded7500a8993c763e6b71d31681459db9d55 /src/buildstream/source.py | |
parent | a2a2346ac1cb12ba76c894c46faf1468682b678f (diff) | |
download | buildstream-673f8f7fa761d61d7792d91fa2ef9d2595ad9f05.tar.gz |
_yaml: Move 'node_composite' to a method on 'MappingNode'
- Also take care of node_composite_move in the same way.
- Adapt all calling places
Diffstat (limited to 'src/buildstream/source.py')
-rw-r--r-- | src/buildstream/source.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buildstream/source.py b/src/buildstream/source.py index 3ffecca7d..d1f5a575d 100644 --- a/src/buildstream/source.py +++ b/src/buildstream/source.py @@ -1284,7 +1284,7 @@ class Source(Plugin): config = cls.__defaults.get_mapping('config', default={}) config = config.copy() - _yaml.composite(config, meta.config) + meta.config.composite(config) config._assert_fully_composited() return config |