diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-07-02 16:50:35 +0100 |
|---|---|---|
| committer | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-07-02 16:50:35 +0100 |
| commit | 17a53d990a606c786c830b46cb93a2a7e093ec4e (patch) | |
| tree | 8c48d0e6fea1c78b272bb0bcca676c0db2065473 /src/buildstream/element.py | |
| parent | bcbff34e7138021b0887dc1865f9f16252e18b48 (diff) | |
| download | buildstream-17a53d990a606c786c830b46cb93a2a7e093ec4e.tar.gz | |
_yaml: Move 'node_final_assertions' to 'Node._assert_fully_composited'bschubert/node-api-noassertions
Diffstat (limited to 'src/buildstream/element.py')
| -rw-r--r-- | src/buildstream/element.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py index c2e4b9105..a11ba21b9 100644 --- a/src/buildstream/element.py +++ b/src/buildstream/element.py @@ -2556,7 +2556,7 @@ class Element(Plugin): _yaml.composite(environment, default_env) _yaml.composite(environment, meta.environment) - _yaml.node_final_assertions(environment) + environment._assert_fully_composited() return environment @@ -2602,7 +2602,7 @@ class Element(Plugin): _yaml.composite(variables, default_vars) _yaml.composite(variables, meta.variables) - _yaml.node_final_assertions(variables) + variables._assert_fully_composited() for var in ('project-name', 'element-name', 'max-jobs'): provenance = _yaml.node_get_provenance(variables, var) @@ -2624,7 +2624,7 @@ class Element(Plugin): config = config.copy() _yaml.composite(config, meta.config) - _yaml.node_final_assertions(config) + config._assert_fully_composited() return config @@ -2651,7 +2651,7 @@ class Element(Plugin): _yaml.composite(sandbox_config, sandbox_defaults) _yaml.composite(sandbox_config, meta.sandbox) - _yaml.node_final_assertions(sandbox_config) + sandbox_config._assert_fully_composited() # Sandbox config, unlike others, has fixed members so we should validate them _yaml.node_validate(sandbox_config, ['build-uid', 'build-gid', 'build-os', 'build-arch']) @@ -2690,7 +2690,7 @@ class Element(Plugin): element_bst['split-rules'] = base_splits element_public['bst'] = element_bst - _yaml.node_final_assertions(element_public) + element_public._assert_fully_composited() return element_public |