Skip to content

element.py: Compute cache key also for rdep without buildable callback #1457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juergbi merged 2 commits into from
Mar 18, 2021
Merged

element.py: Compute cache key also for rdep without buildable callback #1457

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c82bc8
element.py: Reorder checks in _buildable()
juergbi Mar 17, 2021
7b5a125
element.py: Compute cache key also for rdep without buildable callback
juergbi Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/buildstream/element.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,10 +1264,12 @@ def _cached_failure(self):
# (bool): Whether this element can currently be built
#
def _buildable(self):
if self._fetch_needed():
# This check must be before `_fetch_needed()` as source cache status
# is not always available for non-build pipelines.
if not self.__assemble_scheduled:
return False

if not self.__assemble_scheduled:
if self._fetch_needed():
return False

return self.__build_deps_uncached == 0
Expand Down Expand Up @@ -2410,10 +2412,12 @@ def _update_ready_for_runtime_and_cached(self):
rdep.__build_deps_uncached -= 1
assert not rdep.__build_deps_uncached < 0

if rdep.__buildable_callback is not None and rdep._buildable():
if rdep._buildable():
rdep.__update_cache_key_non_strict()
rdep.__buildable_callback(rdep)
rdep.__buildable_callback = None

if rdep.__buildable_callback is not None:
rdep.__buildable_callback(rdep)
rdep.__buildable_callback = None

# _walk_artifact_files()
#
Expand Down