cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use the loaded variable since we have it assigned, not just for error detection.

Browse source
This commit is contained in:
Michael DeHaan 2014-03-06 22:15:21 -05:00
parent 3f07ec3d73
commit e486dbab04
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/utils/__init__.py
View file

@ -355,6 +355,7 @@ def parse_yaml(data, path_hint=None):
''' convert a yaml string to a data structure. Also supports JSON, ssssssh!!!''' ''' convert a yaml string to a data structure. Also supports JSON, ssssssh!!!'''
data = data.lstrip() data = data.lstrip()
loaded = None
if data.startswith("{") or data.startswith("["): if data.startswith("{") or data.startswith("["):
# since the line starts with { or [ we can infer this is a JSON document. # since the line starts with { or [ we can infer this is a JSON document.
try: try:
@ -368,7 +369,7 @@ def parse_yaml(data, path_hint=None):
# else this is pretty sure to be a YAML document # else this is pretty sure to be a YAML document
loaded = yaml.safe_load(data) loaded = yaml.safe_load(data)
return smush_ds(yaml.safe_load(data)) return smush_ds(loaded)
def process_common_errors(msg, probline, column): def process_common_errors(msg, probline, column):
replaced = probline.replace(" ","") replaced = probline.replace(" ","")