ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Avoid duplicated recursive calls in inventory CLI (#48598)

Browse source
This commit is contained in:
Alan Rominger 2018-11-30 05:36:19 -05:00 committed by John R Barker
parent b4ce4e1571
commit d536be6530
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/cli/inventory.py
View file

@ -324,6 +324,8 @@ class InventoryCLI(CLI):
def json_inventory(self, top): def json_inventory(self, top):
seen = set()
def format_group(group): def format_group(group):
results = {} results = {}
results[group.name] = {} results[group.name] = {}
@ -332,7 +334,9 @@ class InventoryCLI(CLI):
results[group.name]['children'] = [] results[group.name]['children'] = []
for subgroup in sorted(group.child_groups, key=attrgetter('name')): for subgroup in sorted(group.child_groups, key=attrgetter('name')):
results[group.name]['children'].append(subgroup.name) results[group.name]['children'].append(subgroup.name)
results.update(format_group(subgroup)) if subgroup.name not in seen:
results.update(format_group(subgroup))
seen.add(subgroup.name)
if self.options.export: if self.options.export:
results[group.name]['vars'] = self._get_group_variables(group) results[group.name]['vars'] = self._get_group_variables(group)