From 57e51f7fdf2b3a2894abcf8221709bb77ae29d36 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Mon, 11 Feb 2013 23:25:50 +0100 Subject: [PATCH] Clean up some extra_vars redundancy --- lib/ansible/playbook/play.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index 2c0c65fb24..51bf4b82dc 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -184,9 +184,6 @@ class Play(object): else: vars.update(self.vars) - if type(self.playbook.extra_vars) == dict: - vars.update(self.playbook.extra_vars) - if type(self.vars_prompt) == list: for var in self.vars_prompt: if not 'name' in var: @@ -218,9 +215,10 @@ class Play(object): else: raise errors.AnsibleError("'vars_prompt' section is malformed, see docs") - results = self.playbook.extra_vars.copy() - results.update(vars) - return results + if type(self.playbook.extra_vars) == dict: + vars.update(self.playbook.extra_vars) + + return vars # *************************************************