diff options
| author | Tristan van Berkom <tristan.vanberkom@codethink.co.uk> | 2020-05-19 19:15:51 +0900 |
|---|---|---|
| committer | Tristan van Berkom <tristan.vanberkom@codethink.co.uk> | 2020-05-24 17:38:16 +0900 |
| commit | d8dc6bcf56b0ec73f1a5c954ccb184517e748ec5 (patch) | |
| tree | 4a66938844f16744a8507f9403a2f812a3f57f9a /src/buildstream/_includes.py | |
| parent | 99063c732b56fb92f6c8b8c32bdb66eb4fb015e6 (diff) | |
| download | buildstream-d8dc6bcf56b0ec73f1a5c954ccb184517e748ec5.tar.gz | |
_loader/loader.py: Reoganized public/private methodstristan/loader-api-fixup
* This file had `clean_caches()` documented as public but
the function was actually private `_clean_caches()`: Moved this to
the end of the class in the private section.
* The `_get_loader()` was marked as private but is in fact public,
and used by the project to load cross junction include files.
This patch also updates `_includes.py` to call the public `get_loader()`
method instead of sneaking in and calling the private `_get_loader()` method
(while also removing one redundant line of code from the same function).
Diffstat (limited to 'src/buildstream/_includes.py')
| -rw-r--r-- | src/buildstream/_includes.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/buildstream/_includes.py b/src/buildstream/_includes.py index 2ecb70a31..7f4863e52 100644 --- a/src/buildstream/_includes.py +++ b/src/buildstream/_includes.py @@ -151,8 +151,7 @@ class Includes: shortname = include if ":" in include: junction, include = include.split(":", 1) - junction_loader = loader._get_loader(junction) - current_loader = junction_loader + current_loader = loader.get_loader(junction) current_loader.project.ensure_fully_loaded() else: current_loader = loader |