summaryrefslogtreecommitdiff
path: root/src/buildstream/_context.py
diff options
context:
space:
mode:
authorBenjamin Schubert <ben.c.schubert@gmail.com>2019-07-09 17:31:43 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-07-15 14:14:03 +0000
commit20335e6cd37cf40111042f324d2daec249628c64 (patch)
treee44b9b7e835a502e153999836a722bb943458c9a /src/buildstream/_context.py
parent571550ad91f6ea73bc2ce5b0e433f8909aa3c0a0 (diff)
downloadbuildstream-20335e6cd37cf40111042f324d2daec249628c64.tar.gz
_yaml: Set 'MappingNode' public-private API
- _composite -> __composite (internal) - composite -> _composite (BuildStream private) - composite_under -> _composite_under (BuildStream private) - get -> _get (internal)
Diffstat (limited to 'src/buildstream/_context.py')
-rw-r--r--src/buildstream/_context.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buildstream/_context.py b/src/buildstream/_context.py
index 2243192b3..37af45ca9 100644
--- a/src/buildstream/_context.py
+++ b/src/buildstream/_context.py
@@ -192,7 +192,7 @@ class Context():
if config:
self.config_origin = os.path.abspath(config)
user_config = _yaml.load(config)
- user_config.composite(defaults)
+ user_config._composite(defaults)
# Give obsoletion warnings
if 'builddir' in defaults: