From c5bb1394b93714b546684be3a94181eedc5719ab Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Mon, 16 Sep 2013 13:16:06 -0500
Subject: [PATCH] Check to make sure default_vars in the datastructure isn't
 empty

Fixes #4129
---
 lib/ansible/playbook/play.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py
index 1c833a4de4..578a2d8fc3 100644
--- a/lib/ansible/playbook/play.py
+++ b/lib/ansible/playbook/play.py
@@ -407,7 +407,12 @@ class Play(object):
                     else:
                         raise errors.AnsibleError("parse error: task includes cannot be used with other directives: %s" % k)
 
-                default_vars = utils.combine_vars(self.default_vars, x.get('default_vars', {}))
+                default_vars = x.get('default_vars', {})
+                if not default_vars:
+                    default_vars = self.default_vars
+                else:
+                    default_vars = utils.combine_vars(self.default_vars, default_vars)
+
                 if 'vars' in x:
                     task_vars = utils.combine_vars(task_vars, x['vars'])
                 if 'only_if' in x: