diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-10-17 18:01:59 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-10-17 20:12:54 +0900 |
| commit | e5973b32dc8fa67e207f0d1052fcdcb373028b6a (patch) | |
| tree | 23abbd2a3fa2a6f2daae8a95d58c0e93cd740952 | |
| parent | 4488ddf55034c4b00c9ce221f303f205e13c85a9 (diff) | |
| download | buildstream-e5973b32dc8fa67e207f0d1052fcdcb373028b6a.tar.gz | |
_loader.py: Updated for _yaml.composite() API change
| -rw-r--r-- | buildstream/_loader.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/buildstream/_loader.py b/buildstream/_loader.py index d1738b92a..da705bae4 100644 --- a/buildstream/_loader.py +++ b/buildstream/_loader.py @@ -25,7 +25,7 @@ from collections import Mapping from . import LoadError, LoadErrorReason from . import _yaml -from ._yaml import CompositePolicy, CompositeTypeError, CompositeOverrideError +from ._yaml import CompositeTypeError from ._metaelement import MetaElement from ._metasource import MetaSource @@ -86,9 +86,7 @@ def resolve_arch(data, host_arch, target_arch=None): if arch: try: - _yaml.composite_dict(data, arch, - policy=CompositePolicy.ARRAY_APPEND, - typesafe=True) + _yaml.composite_dict(data, arch) except CompositeTypeError as e: provenance = _yaml.node_get_provenance(arch, key=active_arch) raise LoadError(LoadErrorReason.ILLEGAL_COMPOSITE, |