diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2020-05-06 19:47:11 +0900 |
|---|---|---|
| committer | Tristan van Berkom <tristan.vanberkom@codethink.co.uk> | 2020-06-08 23:50:34 +0900 |
| commit | c9a00fd7124810b38b1343dda4265444c29d603b (patch) | |
| tree | 3133a3e9d2d45bdd58de4704bcf7f2d65fb0bc0d /src/buildstream | |
| parent | feb82abe89c56a0f6bfbddcf69e1534c68b7e973 (diff) | |
| download | buildstream-c9a00fd7124810b38b1343dda4265444c29d603b.tar.gz | |
_loader/loadelement.pyx: Load full element names recursively.
When opening up the possibility of loading the same junction twice,
it becomes possible to have multiple elements with the same name
following the current implementation logic which enforces that
you must have a toplevel junction to coalesce junctions and synchronize
their configuration.
Since we no longer coalesce junction names, we need to allow elements
to be reported in the UI with their full depth.
Diffstat (limited to 'src/buildstream')
| -rw-r--r-- | src/buildstream/_loader/loadelement.pyx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buildstream/_loader/loadelement.pyx b/src/buildstream/_loader/loadelement.pyx index 2f4e7a0f9..014f01746 100644 --- a/src/buildstream/_loader/loadelement.pyx +++ b/src/buildstream/_loader/loadelement.pyx @@ -107,7 +107,7 @@ cdef class LoadElement: # if loader.project.junction: # dependency is in subproject, qualify name - self.full_name = '{}:{}'.format(loader.project.junction.name, self.name) + self.full_name = '{}:{}'.format(loader.project.junction._get_full_name(), self.name) else: # dependency is in top-level project self.full_name = self.name |