summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos Evripiotis <jevripiotis@bloomberg.net>2019-03-15 15:46:50 +0000
committerAngelos Evripiotis <jevripiotis@bloomberg.net>2019-03-15 15:55:40 +0000
commitb8f88ffb6b3bae3a74c0b71fb2b6045ed06fb452 (patch)
treeb243165111c75e411c3e1b9bfcfb53a4669f2a05
parentcb97a6ad5f9d620436058d5ee1efbdabcebffac5 (diff)
downloadbuildstream-b8f88ffb6b3bae3a74c0b71fb2b6045ed06fb452.tar.gz
loader: use context_for_bsterror on junction load
-rw-r--r--buildstream/_loader/loader.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/buildstream/_loader/loader.py b/buildstream/_loader/loader.py
index 804dc5f7e..d4f0371ca 100644
--- a/buildstream/_loader/loader.py
+++ b/buildstream/_loader/loader.py
@@ -21,7 +21,7 @@ import os
from functools import cmp_to_key
from collections.abc import Mapping
-from .._exceptions import LoadError, LoadErrorReason
+from .._exceptions import LoadError, LoadErrorReason, context_for_bsterror
from .. import Consistency
from .. import _yaml
from ..element import Element
@@ -265,8 +265,9 @@ class Loader():
for dep in dependencies:
if dep.junction:
self._load_file(dep.junction, rewritable, ticker, fetch_subprojects, yaml_cache, dep.provenance)
- loader = self._get_loader(dep.junction, rewritable=rewritable, ticker=ticker,
- fetch_subprojects=fetch_subprojects)
+ with context_for_bsterror(dep.provenance):
+ loader = self._get_loader(dep.junction, rewritable=rewritable, ticker=ticker,
+ fetch_subprojects=fetch_subprojects)
else:
loader = self