diff options
| author | Benjamin Schubert <contact@benschubert.me> | 2019-06-25 21:14:40 +0100 |
|---|---|---|
| committer | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-06-27 15:08:11 +0100 |
| commit | 4e66ca802766545084018441b2a2ddda81c34f2f (patch) | |
| tree | 6b1c532cb502a78ca769d73c71ddbf724dad3d08 /src/buildstream/plugins/elements/junction.py | |
| parent | 4652bfa0cbd86bdf24dae416b75c2607e5edcd41 (diff) | |
| download | buildstream-bschubert/node-api-keys.tar.gz | |
_yaml: Remove 'node_items' and add 'MappingNode.items()'bschubert/node-api-keys
One difference is that 'MappingNode.items()' does not strip the
provenance from scalars and lists, which ends up not affecting the
code much.
Diffstat (limited to 'src/buildstream/plugins/elements/junction.py')
| -rw-r--r-- | src/buildstream/plugins/elements/junction.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buildstream/plugins/elements/junction.py b/src/buildstream/plugins/elements/junction.py index d30e34828..b21ef0777 100644 --- a/src/buildstream/plugins/elements/junction.py +++ b/src/buildstream/plugins/elements/junction.py @@ -188,7 +188,7 @@ class JunctionElement(Element): # 3. config['path'] if self.target and any(self.sources()): raise ElementError("junction elements cannot define both 'sources' and 'target' config option") - if self.target and any(self.node_items(self.options)): + if self.target and any(self.options.items()): raise ElementError("junction elements cannot define both 'options' and 'target'") if self.target and self.path: raise ElementError("junction elements cannot define both 'path' and 'target'") |