internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't ignore a duplicate host for an already processed include (#40361)

Browse Source 
* Don't ignore a duplicate host for an already processed include, assume that the repetition indicates a new include. Fixes #40317

* Add intg tests to ensure duplicate items in loop are not deduped

* Add note about relative indexing
This commit is contained in:
Matt Martz
2018-06-08 15:36:22 -05:00
committed by GitHub
parent 77b54a3267
commit 76867730bf
4 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/ansible/playbook/included_file.py
View File

@@ -44,6 +44,8 @@ class IncludedFile:
def add_host(self, host):
if host not in self._hosts:
self._hosts.append(host)
return
raise ValueError()
def __eq__(self, other):
return other._filename == self._filename and other._args == self._args and other._task._parent._uuid == self._task._parent._uuid
@@ -160,12 +162,24 @@ class IncludedFile:
inc_file = IncludedFile(role_name, include_variables, new_task, is_role=True)
try:
pos = included_files.index(inc_file)
inc_file = included_files[pos]
except ValueError:
included_files.append(inc_file)
idx = 0
orig_inc_file = inc_file
while 1:
try:
pos = included_files[idx:].index(orig_inc_file)
# pos is relative to idx since we are slicing
# use idx + pos due to relative indexing
inc_file = included_files[idx + pos]
except ValueError:
included_files.append(orig_inc_file)
inc_file = orig_inc_file
inc_file.add_host(original_host)
try:
inc_file.add_host(original_host)
except ValueError:
# The host already exists for this include, advance forward, this is a new include
idx += pos + 1
else:
break
return included_files