summaryrefslogtreecommitdiff
path: root/buildstream/source.py
diff options
context:
space:
mode:
authorGökçen Nurlu <gnurlu1@bloomberg.net>2019-02-11 10:47:16 +0000
committerGökçen Nurlu <gnurlu1@bloomberg.net>2019-02-11 10:47:16 +0000
commit97c7151f61c55739e65720f50910b880d5c03bd5 (patch)
tree2a315ad617f4c47c4e43a4221725e53c8802c2d1 /buildstream/source.py
parent4ed12f6101547786863c2d8deb68d1c50c005d66 (diff)
downloadbuildstream-test_pyyaml.tar.gz
Continue lazy provenance infotest_pyyaml
Diffstat (limited to 'buildstream/source.py')
-rw-r--r--buildstream/source.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/buildstream/source.py b/buildstream/source.py
index 9e9bad71c..eaecec136 100644
--- a/buildstream/source.py
+++ b/buildstream/source.py
@@ -254,7 +254,7 @@ class Source(Plugin):
All Sources derive from this class, this interface defines how
the core will be interacting with Sources.
"""
- __defaults = {} # The defaults from the project
+ __defaults = _yaml.BstNode('', {}, tuple()) # The defaults from the project
__defaults_set = False # Flag, in case there are not defaults at all
BST_REQUIRES_PREVIOUS_SOURCES_TRACK = False
@@ -1117,7 +1117,7 @@ class Source(Plugin):
sources = project.first_pass_config.source_overrides
else:
sources = project.source_overrides
- type(self).__defaults = sources.get(self.get_kind(), {})
+ type(self).__defaults = sources.get(self.get_kind(), _yaml.BstNode('', {}, tuple()))
type(self).__defaults_set = True
# This will resolve the final configuration to be handed
@@ -1127,6 +1127,8 @@ class Source(Plugin):
config = _yaml.node_get(self.__defaults, Mapping, 'config', default_value={})
config = _yaml.node_chain_copy(config)
+ print("copied config:", config)
+ print("meta config:", meta.config)
_yaml.composite(config, meta.config)
_yaml.node_final_assertions(config)