cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add tags from handlers to tag availability calculation

Browse source
This commit is contained in:
James Cammarata 2014-03-10 10:05:31 -05:00
parent 4993cb57f4
commit 6577ff5f85
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/playbook/play.py
View file

@ -579,6 +579,7 @@ class Play(object):
for x in results: for x in results:
if self.tags is not None: if self.tags is not None:
self.tags = list(set(self.tags).union(set(x.tags)))
x.tags.extend(self.tags) x.tags.extend(self.tags)
return results return results
@ -686,11 +687,15 @@ class Play(object):
unmatched_tags: tags that were found within the current play but do not match unmatched_tags: tags that were found within the current play but do not match
any provided by the user ''' any provided by the user '''
# gather all the tags in all the tasks into one list # gather all the tags in all the tasks and handlers into one list
# FIXME: isn't this in self.tags already?
all_tags = [] all_tags = []
for task in self._tasks: for task in self._tasks:
if not task.meta: if not task.meta:
all_tags.extend(task.tags) all_tags.extend(task.tags)
for handler in self._handlers:
all_tags.extend(handler.tags)
# compare the lists of tags using sets and return the matched and unmatched # compare the lists of tags using sets and return the matched and unmatched
all_tags_set = set(all_tags) all_tags_set = set(all_tags)