Merge branch 'bschubert/rework-node-creations' into 'bschubert/new-node-api'

Rework synthetic node creation

See merge request BuildStream/buildstream!1447

1 files changed, 3 insertions, 3 deletions

diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index a4496e192..280eeb8f1 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -2515,7 +2515,7 @@ class Element(Plugin):
         # Defaults are loaded once per class and then reused
         #
         if cls.__defaults is None:
-            defaults = _yaml.new_empty_node()
+            defaults = _yaml.Node.from_dict({})
 
             if plugin_conf is not None:
                 # Load the plugin's accompanying .yaml file if one was provided
@@ -2550,7 +2550,7 @@ class Element(Plugin):
         default_env = cls.__defaults.get_mapping("environment", default={})
 
         if meta.is_junction:
-            environment = _yaml.new_empty_node()
+            environment = _yaml.Node.from_dict({})
         else:
             environment = project.base_environment.copy()
 
@@ -2633,7 +2633,7 @@ class Element(Plugin):
     @classmethod
     def __extract_sandbox_config(cls, project, meta):
         if meta.is_junction:
-            sandbox_config = _yaml.new_node_from_dict({
+            sandbox_config = _yaml.Node.from_dict({
                 'build-uid': 0,
                 'build-gid': 0
             })