Testingtest-public-data

2 files changed, 32 insertions, 4 deletions

diff --git a/buildstream/_yaml.py b/buildstream/_yaml.py
index 93fae4903..c8151d501 100644
--- a/buildstream/_yaml.py
+++ b/buildstream/_yaml.py
@@ -602,3 +602,33 @@ def list_chain_copy(source):
             copy.append(item)
 
     return copy
+
+
+def node_copy(source):
+    copy = {}
+    for key, value in source.items():
+        if isinstance(value, collections.Mapping):
+            copy[key] = node_copy(value)
+        elif isinstance(value, list):
+            copy[key] = list_copy(value)
+        elif isinstance(value, Provenance):
+            copy[key] = value.clone()
+
+    ensure_provenance(copy)
+
+    return copy
+
+
+def list_copy(source):
+    copy = []
+    for item in source:
+        if isinstance(item, collections.Mapping):
+            copy.append(node_copy(item))
+        elif isinstance(item, list):
+            copy.append(list_copy(item))
+        elif isinstance(item, Provenance):
+            copy.append(item.clone())
+        else:
+            copy.append(item)
+
+    return copy
diff --git a/buildstream/element.py b/buildstream/element.py
index 1b0bf2b1e..ee8b86b49 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -435,7 +435,7 @@ class Element(Plugin):
 
         data = self.__dynamic_public.get(domain)
         if data is not None:
-            data = _yaml.node_chain_copy(data)
+            data = _yaml.node_copy(data)
 
         return data
 
@@ -455,9 +455,7 @@ class Element(Plugin):
             self._load_public_data()
 
         if data is not None:
-            # Should we ensure provenance information here ?
-            #
-            data = copy.deepcopy(data)
+            data = _yaml.node_copy(data)
 
         self.__dynamic_public[domain] = data