[Notes] [Git][BuildStream/buildstream][doraskayo/filter-indirect-deps-fix] filter.py: don't recurse when staging dependencies

[Dor Askayo <gitlab mg gitlab com>]

Title: GitLab

Dor Askayo pushed to branch doraskayo/filter-indirect-deps-fix at BuildStream / buildstream

Commits:

• 5292c8e8
  by Dor Askayo at 2019-01-26T00:20:38Z

  filter.py: don't recurse when staging dependencies
  
  Also bump the element's version so cached artifacts would be
  invalidated.
  
  Fixes #883
  

1 changed file:

• buildstream/plugins/elements/filter.py

Changes:

buildstream/plugins/elements/filter.py

---

...	...	@@ -47,6 +47,8 @@ from buildstream import Element, ElementError, Scope
47	47	class FilterElement(Element):
48	48	# pylint: disable=attribute-defined-outside-init
49	49
	50	+ BST_ARTIFACT_VERSION = 1
	51	+
50	52	# The filter element's output is its dependencies, so
51	53	# we must rebuild if the dependencies change even when
52	54	# not in strict build plans.
...	...	@@ -102,7 +104,7 @@ class FilterElement(Element):
102	104
103	105	def assemble(self, sandbox):
104	106	with self.timed_activity("Staging artifact", silent_nested=True):
105		- for dep in self.dependencies(Scope.BUILD):
	107	+ for dep in self.dependencies(Scope.BUILD, recurse=False):
106	108	dep.stage_artifact(sandbox, include=self.include,
107	109	exclude=self.exclude, orphans=self.include_orphans)
108	110	return ""

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.