summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildstream/_includes.py9
-rw-r--r--buildstream/_loader/loader.py2
-rw-r--r--buildstream/_project.py2
-rw-r--r--buildstream/source.py2
4 files changed, 10 insertions, 5 deletions
diff --git a/buildstream/_includes.py b/buildstream/_includes.py
index e4afeaf82..acecd5e47 100644
--- a/buildstream/_includes.py
+++ b/buildstream/_includes.py
@@ -10,11 +10,15 @@ from ._exceptions import LoadError, LoadErrorReason
#
# Args:
# loader (Loader): The Loader object
+# copy_tree (bool): Whether to make a copy, of tree in
+# provenance. Should be true if intended to be
+# serialized.
class Includes:
- def __init__(self, loader):
+ def __init__(self, loader, *, copy_tree=False):
self._loader = loader
self._loaded = {}
+ self._copy_tree = copy_tree
# process()
#
@@ -99,7 +103,8 @@ class Includes:
if file_path not in self._loaded:
self._loaded[key] = _yaml.load(os.path.join(directory, include),
shortname=shortname,
- project=project)
+ project=project,
+ copy_tree=self._copy_tree)
return self._loaded[key], file_path, current_loader
# _process_value()
diff --git a/buildstream/_loader/loader.py b/buildstream/_loader/loader.py
index 275bc20cf..8553bc6dd 100644
--- a/buildstream/_loader/loader.py
+++ b/buildstream/_loader/loader.py
@@ -78,7 +78,7 @@ class Loader():
self._elements = {} # Dict of elements
self._loaders = {} # Dict of junction loaders
- self._includes = Includes(self)
+ self._includes = Includes(self, copy_tree=True)
# load():
#
diff --git a/buildstream/_project.py b/buildstream/_project.py
index 702fd81f4..c489e9025 100644
--- a/buildstream/_project.py
+++ b/buildstream/_project.py
@@ -419,7 +419,7 @@ class Project():
parent=parent_loader,
tempdir=tempdir)
- self._project_includes = Includes(self.loader)
+ self._project_includes = Includes(self.loader, copy_tree=False)
project_conf_first_pass = _yaml.node_copy(self._project_conf)
self._project_includes.process(project_conf_first_pass, only_local=True)
diff --git a/buildstream/source.py b/buildstream/source.py
index 9822beeec..6d5640532 100644
--- a/buildstream/source.py
+++ b/buildstream/source.py
@@ -794,7 +794,7 @@ class Source(Plugin):
# Save the ref in the originating file
#
try:
- _yaml.dump(_yaml.node_sanitize(provenance.toplevel), provenance.filename.name)
+ _yaml.dump(provenance.toplevel, provenance.filename.name)
except OSError as e:
raise SourceError("{}: Error saving source reference to '{}': {}"
.format(self, provenance.filename.name, e),