valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better YAML syntax error handling (#33375)

Browse Source 
Closes #26574
This commit is contained in:
Mike Place 2016-05-19 14:56:45 -07:00 committed by Nicole Thomas
parent bb3e98cad2
commit 2b5ad128bf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/renderers/yaml.py
View File

@ -9,6 +9,7 @@ from __future__ import absolute_import
import logging
import warnings
from yaml.scanner import ScannerError
from yaml.parser import ParserError
from yaml.constructor import ConstructorError
# Import salt libs
@ -52,7 +53,7 @@ def render(yaml_data, saltenv='base', sls='', argline='', **kws):
err_type = _ERROR_MAP.get(exc.problem, exc.problem)
line_num = exc.problem_mark.line + 1
raise SaltRenderError(err_type, line_num, exc.problem_mark.buffer)
except ConstructorError as exc:
except (ParserError, ConstructorError) as exc:
raise SaltRenderError(exc)
if len(warn_list) > 0:
for item in warn_list: