You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by tv...@apache.org on 2021/02/04 08:10:04 UTC
[buildstream] 29/30: Give less priority to projectdata.yml than
includes
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch valentindavid/flatpak-demo
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 6028168de6fc4bbf27b7e04c96a336d641536dc5
Author: Valentin David <va...@codethink.co.uk>
AuthorDate: Sat Jul 7 09:11:12 2018 +0200
Give less priority to projectdata.yml than includes
---
buildstream/_project.py | 53 ++++++++++++++++++++++++++-----------------------
1 file changed, 28 insertions(+), 25 deletions(-)
diff --git a/buildstream/_project.py b/buildstream/_project.py
index 5e89f88..ccc62d8 100644
--- a/buildstream/_project.py
+++ b/buildstream/_project.py
@@ -273,7 +273,6 @@ class Project():
self._partially_loaded = False
self._fully_loaded = False
self._project_includes = None
- self._config_node = None
profile_start(Topics.LOAD_PROJECT, self.directory.replace(os.sep, '-'))
self._load(parent_loader=parent_loader, tempdir=tempdir)
@@ -415,19 +414,20 @@ class Project():
# Load builtin default
projectfile = os.path.join(self.directory, _PROJECT_CONF_FILE)
- self._config_node = _yaml.load(_site.default_project_config)
+ self._default_config_node = _yaml.load(_site.default_project_config)
# Load project local config and override the builtin
try:
- project_conf = _yaml.load(projectfile)
+ self._project_conf = _yaml.load(projectfile)
except LoadError as e:
# Raise a more specific error here
raise LoadError(LoadErrorReason.MISSING_PROJECT_CONF, str(e))
- _yaml.composite(self._config_node, project_conf)
+ pre_config_node = _yaml.node_copy(self._default_config_node)
+ _yaml.composite(pre_config_node, self._project_conf)
# Assert project's format version early, before validating toplevel keys
- format_version = _yaml.node_get(self._config_node, int, 'format-version')
+ format_version = _yaml.node_get(pre_config_node, int, 'format-version')
if BST_FORMAT_VERSION < format_version:
major, minor = utils.get_bst_version()
raise LoadError(
@@ -437,15 +437,15 @@ class Project():
# The project name, element path and option declarations
# are constant and cannot be overridden by option conditional statements
- self.name = _yaml.node_get(self._config_node, str, 'name')
+ self.name = _yaml.node_get(pre_config_node, str, 'name')
# Validate that project name is a valid symbol name
- _yaml.assert_symbol_name(_yaml.node_get_provenance(self._config_node, 'name'),
+ _yaml.assert_symbol_name(_yaml.node_get_provenance(pre_config_node, 'name'),
self.name, "project name")
self.element_path = os.path.join(
self.directory,
- _yaml.node_get(self._config_node, str, 'element-path')
+ _yaml.node_get(pre_config_node, str, 'element-path')
)
self.config.options = OptionPool(self.element_path)
@@ -457,15 +457,17 @@ class Project():
self._project_includes = Includes(self.loader)
- config_no_include = _yaml.node_copy(self._config_node)
- self._project_includes.process(config_no_include, only_local=True)
+ project_conf_first_pass = _yaml.node_copy(self._project_conf)
+ self._project_includes.process(project_conf_first_pass, only_local=True)
+ config_no_include = _yaml.node_copy(self._default_config_node)
+ _yaml.composite(config_no_include, project_conf_first_pass)
self._load_pass(config_no_include, self.first_pass_config, True)
# Use separate file for storing source references
- self.ref_storage = _yaml.node_get(self._config_node, str, 'ref-storage')
+ self.ref_storage = _yaml.node_get(pre_config_node, str, 'ref-storage')
if self.ref_storage not in [ProjectRefStorage.INLINE, ProjectRefStorage.PROJECT_REFS]:
- p = _yaml.node_get_provenance(self._config_node, 'ref-storage')
+ p = _yaml.node_get_provenance(pre_config_node, 'ref-storage')
raise LoadError(LoadErrorReason.INVALID_DATA,
"{}: Invalid value '{}' specified for ref-storage"
.format(p, self.ref_storage))
@@ -482,11 +484,14 @@ class Project():
if self.junction:
self.junction._get_project().ensure_fully_loaded()
- self._project_includes.process(self._config_node)
+ project_conf_second_pass = _yaml.node_copy(self._project_conf)
+ self._project_includes.process(project_conf_second_pass)
+ config = _yaml.node_copy(self._default_config_node)
+ _yaml.composite(config, project_conf_second_pass)
- self._load_pass(self._config_node, self.config, False)
+ self._load_pass(config, self.config, False)
- _yaml.node_validate(self._config_node, self.INCLUDE_CONFIG_KEYS + self.MAIN_FILE_CONFIG_KEYS)
+ _yaml.node_validate(config, self.INCLUDE_CONFIG_KEYS + self.MAIN_FILE_CONFIG_KEYS)
#
# Now all YAML composition is done, from here on we just load
@@ -494,30 +499,30 @@ class Project():
#
# Load artifacts pull/push configuration for this project
- self.artifact_cache_specs = ArtifactCache.specs_from_config_node(self._config_node)
+ self.artifact_cache_specs = ArtifactCache.specs_from_config_node(config)
# Source url aliases
- self._aliases = _yaml.node_get(self._config_node, Mapping, 'aliases', default_value={})
+ self._aliases = _yaml.node_get(config, Mapping, 'aliases', default_value={})
# Load sandbox environment variables
- self.base_environment = _yaml.node_get(self._config_node, Mapping, 'environment')
- self.base_env_nocache = _yaml.node_get(self._config_node, list, 'environment-nocache')
+ self.base_environment = _yaml.node_get(config, Mapping, 'environment')
+ self.base_env_nocache = _yaml.node_get(config, list, 'environment-nocache')
# Load sandbox configuration
- self._sandbox = _yaml.node_get(self._config_node, Mapping, 'sandbox')
+ self._sandbox = _yaml.node_get(config, Mapping, 'sandbox')
# Load project split rules
- self._splits = _yaml.node_get(self._config_node, Mapping, 'split-rules')
+ self._splits = _yaml.node_get(config, Mapping, 'split-rules')
# Fail on overlap
- self.fail_on_overlap = _yaml.node_get(self._config_node, bool, 'fail-on-overlap')
+ self.fail_on_overlap = _yaml.node_get(config, bool, 'fail-on-overlap')
# Load project.refs if it exists, this may be ignored.
if self.ref_storage == ProjectRefStorage.PROJECT_REFS:
self.refs.load(self.options)
# Parse shell options
- shell_options = _yaml.node_get(self._config_node, Mapping, 'shell')
+ shell_options = _yaml.node_get(config, Mapping, 'shell')
_yaml.node_validate(shell_options, ['command', 'environment', 'host-files'])
self._shell_command = _yaml.node_get(shell_options, list, 'command')
@@ -546,8 +551,6 @@ class Project():
self._shell_host_files.append(mount)
- self._config_node = None
-
# _load_pass():
#
# Loads parts of the project configuration that are different