_include.py: Move yaml related logic to _yaml.pyjennis/compose_backwards

1 files changed, 1 insertions, 6 deletions

diff --git a/buildstream/_includes.py b/buildstream/_includes.py
index 1312d1982..f4a162761 100644
--- a/buildstream/_includes.py
+++ b/buildstream/_includes.py
@@ -82,12 +82,7 @@ class Includes:
                 finally:
                     included.remove(file_path)
 
-                _yaml.composite(include_node, node)
-                to_delete = [key for key, _ in _yaml.node_items(node) if key not in include_node]
-                for key, value in include_node.items():
-                    node[key] = value
-                for key in to_delete:
-                    del node[key]
+                _yaml.composite_and_move(node, include_node)
 
         for _, value in _yaml.node_items(node):
             self._process_value(value,