Merge remote branch 'public/master'

This commit is contained in:
Michael DeHaan 2012-03-26 19:36:03 -04:00
commit eb67a91c57

View file

@ -105,10 +105,10 @@ class PlayBook(object):
if x.find("=") != -1:
(k,v) = x.split("=")
inject_vars[k] = v
included = utils.template_from_file(path, inject_vars)
included = utils.parse_yaml(included)
for x in included:
new_tasks.append(x)
included = utils.template_from_file(path, inject_vars)
included = utils.parse_yaml(included)
for x in included:
new_tasks.append(x)
# *****************************************************