summaryrefslogtreecommitdiff
path: root/buildstream/_project.py
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2019-04-04 14:04:09 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2019-04-04 14:04:09 +0100
commit987548a4e439950ac7b6d68adbf1342f783a398a (patch)
tree7ddadcdd19f9a0bc9f80b46b6f83adc5ebd8be71 /buildstream/_project.py
parent1edb56ae015cca0e24e6555898b0e2de83bdd62f (diff)
downloadbuildstream-danielsilverstone-ct/reenable-key-in-node.tar.gz
_yaml.py: Remove node_containsdanielsilverstone-ct/reenable-key-in-node
Now that we permit `key in somenode` remove the no longer needed function to check if a node contains a key. Signed-off-by: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Diffstat (limited to 'buildstream/_project.py')
-rw-r--r--buildstream/_project.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/_project.py b/buildstream/_project.py
index c6d0f29fd..843def2ca 100644
--- a/buildstream/_project.py
+++ b/buildstream/_project.py
@@ -421,7 +421,7 @@ class Project():
else:
config = self.config
- if not alias or not _yaml.node_contains(config._aliases, alias):
+ if not alias or alias not in config._aliases:
return [None]
mirror_list = []
@@ -950,7 +950,7 @@ class Project():
plugins = _yaml.node_get(origin, Mapping, plugin_group, default_value={})
_yaml.node_set(origin_node, 'plugins', [k for k, _ in _yaml.node_items(plugins)])
for group in expected_groups:
- if _yaml.node_contains(origin_node, group):
+ if group in origin_node:
_yaml.node_del(origin_node, group)
if _yaml.node_get(origin_node, str, 'origin') == 'local':