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

Make sure all tags are in a list before merging for role deps

Browse source 
Fixes #6557
This commit is contained in:
James Cammarata 2014-03-18 12:30:54 -05:00
parent 8a4dca4b86
commit eb7717aa02
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -234,6 +234,8 @@ class Play(object):
# (dep_vars) to look for tags going forward # (dep_vars) to look for tags going forward
def __merge_tags(var_obj): def __merge_tags(var_obj):
old_tags = dep_vars.get('tags', []) old_tags = dep_vars.get('tags', [])
if isinstance(old_tags, basestring):
old_tags = [old_tags, ]
if isinstance(var_obj, dict): if isinstance(var_obj, dict):
new_tags = var_obj.get('tags', []) new_tags = var_obj.get('tags', [])
if isinstance(new_tags, basestring): if isinstance(new_tags, basestring):