diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2019-03-09 20:12:33 +0900 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-12 08:04:52 +0000 |
| commit | 23169d08e4a650369e04263ccdfc6d499b814e31 (patch) | |
| tree | 720b2fa411fec2a0392bb10028858a4c77a0f5a6 | |
| parent | d6ced0d4afdc398edeefe75462c55161c5866f2f (diff) | |
| download | buildstream-23169d08e4a650369e04263ccdfc6d499b814e31.tar.gz | |
_loader/loader.py: Include provenance in missing file errors
This fixes issue #947
| -rw-r--r-- | buildstream/_loader/loader.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/buildstream/_loader/loader.py b/buildstream/_loader/loader.py index c6bc87726..b2f98ea06 100644 --- a/buildstream/_loader/loader.py +++ b/buildstream/_loader/loader.py @@ -202,11 +202,12 @@ class Loader(): # rewritable (bool): Whether we should load in round trippable mode # ticker (callable): A callback to report loaded filenames to the frontend # fetch_subprojects (bool): Whether to fetch subprojects while loading + # provenance (Provenance): The location from where the file was referred to, or None # # Returns: # (LoadElement): A loaded LoadElement # - def _load_file(self, filename, rewritable, ticker, fetch_subprojects): + def _load_file(self, filename, rewritable, ticker, fetch_subprojects, provenance=None): # Silently ignore already loaded files if filename in self._elements: @@ -226,6 +227,8 @@ class Loader(): # alternatives by stripping the element-path from the given # filename, and verifying that it exists. message = "Could not find element '{}' in elements directory '{}'".format(filename, self._basedir) + if provenance: + message = "{}: {}".format(provenance, message) detail = None elements_dir = os.path.relpath(self._basedir, self.project.directory) element_relpath = os.path.relpath(filename, elements_dir) @@ -237,6 +240,8 @@ class Loader(): # If a <directory>.bst file exists in the element path, # let's suggest this as a plausible alternative. message = str(e) + if provenance: + message = "{}: {}".format(provenance, message) detail = None if os.path.exists(os.path.join(self._basedir, filename + '.bst')): element_name = filename + '.bst' @@ -262,13 +267,14 @@ class Loader(): # Load all dependency files for the new LoadElement for dep in element.deps: if dep.junction: - self._load_file(dep.junction, rewritable, ticker, fetch_subprojects) + self._load_file(dep.junction, rewritable, ticker, fetch_subprojects, dep.provenance) loader = self._get_loader(dep.junction, rewritable=rewritable, ticker=ticker, fetch_subprojects=fetch_subprojects) else: loader = self - dep_element = loader._load_file(dep.name, rewritable, ticker, fetch_subprojects) + dep_element = loader._load_file(dep.name, rewritable, ticker, + fetch_subprojects, dep.provenance) if _yaml.node_get(dep_element.node, str, Symbol.KIND) == 'junction': raise LoadError(LoadErrorReason.INVALID_DATA, |