1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00

Merge pull request #36 from chrismeyersfsu/fix-extra_vars_comments

extra_vars_dict: handle the case where an entire yaml file is commented
This commit is contained in:
Matthew Jones 2015-01-23 11:37:57 -05:00
commit 2bb4629fe3

View File

@ -90,6 +90,9 @@ class VarsDictProperty(object):
if d is None:
try:
d = yaml.safe_load(v)
# This can happen if the whole file is commented out
if d is None:
d = {}
except yaml.YAMLError:
pass
if d is None and self.key_value: