From 82f13baea757be4738efcdae74cf33923df8fc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6k=C3=A7en=20Nurlu?= Date: Mon, 23 Dec 2019 15:22:41 +0000 Subject: hmmm sets --- src/buildstream/_pipeline.py | 3 ++- src/buildstream/element.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/buildstream/_pipeline.py b/src/buildstream/_pipeline.py index aee0c55da..7c480ab16 100644 --- a/src/buildstream/_pipeline.py +++ b/src/buildstream/_pipeline.py @@ -186,7 +186,8 @@ class Pipeline: def dependencies(self, targets, scope, *, recurse=True): # Keep track of 'visited' in this scope, so that all targets # share the same context. - visited = (BitMap(), BitMap()) + # visited = (BitMap(), BitMap()) + visited = set(), set() for target in targets: for element in target.dependencies(scope, recurse=recurse, visited=visited): diff --git a/src/buildstream/element.py b/src/buildstream/element.py index ee6b90ce7..6f484e6af 100644 --- a/src/buildstream/element.py +++ b/src/buildstream/element.py @@ -499,7 +499,8 @@ class Element(Plugin): if visited is None: # Visited is of the form (Visited for Scope.BUILD, Visited for Scope.RUN) - visited = (BitMap(), BitMap()) + # visited = (BitMap(), BitMap()) + visited = set(), set() else: # We have already a visited set passed. we might be able to short-circuit if scope in (Scope.BUILD, Scope.ALL) and self._unique_id in visited[0]: -- cgit v1.2.1