diff options
| author | Tristan van Berkom <tristan.vanberkom@codethink.co.uk> | 2020-06-01 20:06:12 +0900 |
|---|---|---|
| committer | Tristan van Berkom <tristan.vanberkom@codethink.co.uk> | 2020-06-01 23:11:04 +0900 |
| commit | e5d0e0c8ab134a874b74176b308f45b440a6f07b (patch) | |
| tree | 9e1484dc517e608ad9f4793030dd75911201decb /src/buildstream/_loader/loader.py | |
| parent | 6ec85d2942ea5a4adb7fbd9f9cd8e8d6beb41435 (diff) | |
| download | buildstream-e5d0e0c8ab134a874b74176b308f45b440a6f07b.tar.gz | |
junctions: Remove all traces of the `target` option
This removes:
* The `target` feature from the junction plugin
* Special case code in the loader for the `target` feature
* The `target` related cases in tests/format/junctions.py
This also adjusts the `target` related documentation in
the `junction` element to suggest using a `link` element for
the purpose of using a subproject junction configuration to
access a common sub-subproject.
Diffstat (limited to 'src/buildstream/_loader/loader.py')
| -rw-r--r-- | src/buildstream/_loader/loader.py | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/buildstream/_loader/loader.py b/src/buildstream/_loader/loader.py index ed0d345a3..b73f5b862 100644 --- a/src/buildstream/_loader/loader.py +++ b/src/buildstream/_loader/loader.py @@ -274,18 +274,6 @@ class Loader: element = Element._new_from_meta(meta_element) element._initialize_state() - # If this junction element points to a sub-sub-project, we need to - # find loader for that project. - if element.target: - subproject_loader = self.get_loader( - element.target_junction, rewritable=rewritable, ticker=ticker, level=level, provenance=provenance - ) - loader = subproject_loader.get_loader( - element.target_element, rewritable=rewritable, ticker=ticker, level=level, provenance=provenance - ) - self._loaders[filename] = loader - return loader - # Handle the case where a subproject has no ref # if not element._has_all_sources_resolved(): |