diff options
| author | Brian Coca <briancoca+ansible@gmail.com> | 2014-03-06 08:28:36 -0500 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2014-03-10 15:55:57 -0500 |
| commit | 8e7a384fcccc1c249075b90043939e4b89ed86a6 (patch) | |
| tree | a2fbcabe19191b5b07768a922fa05b732752d788 /lib/ansible | |
| parent | fe07ebc8010b5e701d573857aeedd5ab5e4cc165 (diff) | |
| download | ansible-8e7a384fcccc1c249075b90043939e4b89ed86a6.tar.gz | |
tags lists are properly uniqued and joined now, also avoids type issues when passed as list/set or strings
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
Diffstat (limited to 'lib/ansible')
| -rw-r--r-- | lib/ansible/playbook/play.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index e9f00e4702..78a1d0b08b 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -235,7 +235,7 @@ class Play(object): included_dep_vars = included_role_dep[2] if included_dep_name == dep: if "tags" in included_dep_vars: - included_dep_vars["tags"] = list(set(included_dep_vars["tags"] + passed_vars["tags"])) + included_dep_vars["tags"] = list(set(included_dep_vars["tags"]).union(set(passed_vars["tags"]))) else: included_dep_vars["tags"] = passed_vars["tags"][:] |