From f50e88d887550e392c499fdfb29a6d4719d83f53 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Sat, 17 Feb 2018 08:06:08 -0800 Subject: [PATCH] Revert "Revert "consider condition for group membership (#69)" (#70)" This reverts commit 787b892947fc0f42ad3970da70576558d85247cd. --- ament_package/group_dependency.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ament_package/group_dependency.py b/ament_package/group_dependency.py index 0e7838d..c2bcc77 100644 --- a/ament_package/group_dependency.py +++ b/ament_package/group_dependency.py @@ -56,5 +56,7 @@ def evaluate_condition(self, context): def extract_group_members(self, packages): self.members = set() for pkg in packages: - if self.name in [g.name for g in pkg.member_of_groups]: + for g in pkg.member_of_groups: + assert g.evaluated_condition is not None + if self.name in [g.name for g in pkg.member_of_groups if g.evaluated_condition]: self.members.add(pkg.name)