[buildstream] 03/07: loader: use context_for_bsterror on junction load

[tv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tvb pushed a commit to branch aevri/provenance_scope
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit b8f88ffb6b3bae3a74c0b71fb2b6045ed06fb452
Author: Angelos Evripiotis <je...@bloomberg.net>
AuthorDate: Fri Mar 15 15:46:50 2019 +0000

    loader: use context_for_bsterror on junction load
---
 buildstream/_loader/loader.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/buildstream/_loader/loader.py b/buildstream/_loader/loader.py
index 804dc5f..d4f0371 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