diff options
| author | Tristan van Berkom <tristan.vanberkom@codethink.co.uk> | 2020-05-30 21:03:33 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2020-05-30 13:21:02 +0000 |
| commit | 15cd8c8142fc0faaaeadb2ffa4e3b23c376d58d4 (patch) | |
| tree | a526a382617d4ffbedec0d2c4db8d6c84c7a509e | |
| parent | 925a6ab5339c6223ced1700024a41debe5c15c39 (diff) | |
| download | buildstream-15cd8c8142fc0faaaeadb2ffa4e3b23c376d58d4.tar.gz | |
_loader/loader.py: Remove useless line of code.
We were redundantly calling Loader._load_file() directly
before calling Loader.get_loader(), even though Loader.get_loader()
implicitly loads the file anyway.
To pass tests, we needed to fix get_loader() to pass provenance
along to Loader._load_file().
| -rw-r--r-- | src/buildstream/_loader/loader.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/buildstream/_loader/loader.py b/src/buildstream/_loader/loader.py index ae729f243..49018629e 100644 --- a/src/buildstream/_loader/loader.py +++ b/src/buildstream/_loader/loader.py @@ -202,7 +202,7 @@ class Loader: return loader try: - self._load_file(filename, rewritable, ticker) + self._load_file(filename, rewritable, ticker, provenance=provenance) except LoadError as e: if e.reason != LoadErrorReason.MISSING_FILE: # other load error @@ -492,7 +492,6 @@ class Loader: current_element[2].append(dep.name) if dep.junction: - self._load_file(dep.junction, rewritable, ticker, dep.provenance) loader = self.get_loader( dep.junction, rewritable=rewritable, ticker=ticker, provenance=dep.provenance ) |