diff options
author | Tristan Maat <tristan.maat@codethink.co.uk> | 2019-09-18 18:21:14 +0100 |
---|---|---|
committer | Tristan Maat <tristan.maat@codethink.co.uk> | 2019-10-10 12:21:15 +0100 |
commit | 87110d6d42e3be6317c13e6e11388ae8dc8eaf4e (patch) | |
tree | 643648212ffa6692569bbd5793a986314686d517 | |
parent | 17144d84c2b63daf6e3aa9b42c6c773f134e8660 (diff) | |
download | buildstream-87110d6d42e3be6317c13e6e11388ae8dc8eaf4e.tar.gz |
Remove XXX comment about missing progress
This should be safe now - this particular point turned out to be
involved in loading dependencies of junction elements, rather than
anything in their projects.
This meant that, yes, we were missing progress, however junction
elements are not allowed to have dependencies in the first place, so
we simply short-circuit their load and avoid the problem altogether.
We also added more explicit progress opt-outs, since it's far too easy
to end up with spurious Nones.
-rw-r--r-- | src/buildstream/_loader/loader.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/buildstream/_loader/loader.py b/src/buildstream/_loader/loader.py index a9e686f1c..d6f8ca861 100644 --- a/src/buildstream/_loader/loader.py +++ b/src/buildstream/_loader/loader.py @@ -596,8 +596,15 @@ class Loader(): return None # meta junction element - # XXX: This is a likely point for progress reporting to end up - # missing some elements, but it currently doesn't appear to be the case. + # + # Note that junction elements are not allowed to have + # dependencies, so disabling progress reporting here should + # have no adverse effects - the junction element itself cannot + # be depended on, so it would be confusing for its load to + # show up in logs. + # + # Any task counting *inside* the junction will be handled by + # its loader. meta_element = self._collect_element_no_deps(self._elements[filename], _NO_PROGRESS) if meta_element.kind != 'junction': raise LoadError("{}{}: Expected junction but element kind is {}" |