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/_context.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/_context.py')
| -rw-r--r-- | src/buildstream/_context.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buildstream/_context.py b/src/buildstream/_context.py index 363ec3a30..6977565f2 100644 --- a/src/buildstream/_context.py +++ b/src/buildstream/_context.py @@ -192,7 +192,7 @@ class Context(): if config: self.config_origin = os.path.abspath(config) user_config = _yaml.load(config) - _yaml.composite(defaults, user_config) + user_config.composite(defaults) # Give obsoletion warnings if 'builddir' in defaults: |