From a01d97f12bc93ab7992a84bc2c6dd248dc2fbdb2 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Thu, 14 Aug 2014 10:55:26 -0500 Subject: [PATCH] Fixing variable name bug introduced in ac8950f Fixes #8617 --- lib/ansible/playbook/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py index ed7dae20d7..c52acf3caa 100644 --- a/lib/ansible/playbook/__init__.py +++ b/lib/ansible/playbook/__init__.py @@ -236,10 +236,10 @@ class PlayBook(object): return vars.copy() play_vars = None - if isinstance(play_vars, dict): + if isinstance(play['vars'], dict): play_vars = play['vars'].copy() play_vars.update(vars) - elif isinstance(play_vars, list): + elif isinstance(play['vars'], list): # nobody should really do this, but handle vars: a=1 b=2 play_vars = play['vars'][:] play_vars.extend([{k:v} for k,v in vars.iteritems()])