filter.py: don't recurse when staging dependenciesdoraskayo/filter-indirect-deps-fix-1.2

Also bump the element's version so cached artifacts would be
invalidated.

Fixes #883

(cherry picked from commit 03111d39e093b11ffc6589071f2f5040d5f61ab4)

1 files changed, 4 insertions, 2 deletions

diff --git a/buildstream/plugins/elements/filter.py b/buildstream/plugins/elements/filter.py
index 22fddd14f..b2c292261 100644
--- a/buildstream/plugins/elements/filter.py
+++ b/buildstream/plugins/elements/filter.py
@@ -47,7 +47,9 @@ from buildstream import Element, ElementError, Scope
 class FilterElement(Element):
     # pylint: disable=attribute-defined-outside-init
 
-    # The filter element's output is it's dependencies, so
+    BST_ARTIFACT_VERSION = 1
+
+    # The filter element's output is its dependencies, so
     # we must rebuild if the dependencies change even when
     # not in strict build plans.
     BST_STRICT_REBUILD = True
@@ -102,7 +104,7 @@ class FilterElement(Element):
 
     def assemble(self, sandbox):
         with self.timed_activity("Staging artifact", silent_nested=True):
-            for dep in self.dependencies(Scope.BUILD):
+            for dep in self.dependencies(Scope.BUILD, recurse=False):
                 dep.stage_artifact(sandbox, include=self.include,
                                    exclude=self.exclude, orphans=self.include_orphans)
         return ""