diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-10-17 18:03:18 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-10-17 20:12:54 +0900 |
| commit | 0e34ee2445f7d934a5f91cf4d79bf83adbef245f (patch) | |
| tree | 8ba8c6aa8e9e4de3a56141517f47d2f3c834f50a | |
| parent | ea44e78e52a39c84feed67b02e49c139ab8402de (diff) | |
| download | buildstream-0e34ee2445f7d934a5f91cf4d79bf83adbef245f.tar.gz | |
project.py: Updated for _yaml.composite() API changes
| -rw-r--r-- | buildstream/project.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/project.py b/buildstream/project.py index 64aefd772..c4b38a5c5 100644 --- a/buildstream/project.py +++ b/buildstream/project.py @@ -30,7 +30,6 @@ was loaded from. import os import multiprocessing # for cpu_count() from collections import Mapping -from ._yaml import CompositePolicy, CompositeTypeError, CompositeOverrideError from . import utils from . import _site from . import _yaml @@ -129,7 +128,8 @@ class Project(): # Load project local config and override the builtin project_conf = _yaml.load(projectfile) - _yaml.composite(config, project_conf, typesafe=True) + _yaml.composite(config, project_conf) + _yaml.node_final_assertions(config) _yaml.node_validate(config, [ 'required-versions', 'element-path', 'variables', |