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

preserve underlying block building error (#56465)

Browse source 
fixes #56462
This commit is contained in:
Brian Coca 2019-05-22 11:28:06 -04:00 committed by GitHub
parent 69b2d7e0f3
commit 8fe9618c84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/better_task_error.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- display underlying error when reporting an invalid ``tasks:`` block.

3
lib/ansible/playbook/play.py
View file

@ -22,6 +22,7 @@ __metaclass__ = type
from ansible import constants as C from ansible import constants as C
from ansible import context from ansible import context
from ansible.errors import AnsibleParserError, AnsibleAssertionError from ansible.errors import AnsibleParserError, AnsibleAssertionError
from ansible.module_utils._text import to_native
from ansible.module_utils.six import string_types from ansible.module_utils.six import string_types
from ansible.playbook.attribute import FieldAttribute from ansible.playbook.attribute import FieldAttribute
from ansible.playbook.base import Base from ansible.playbook.base import Base
@ -145,7 +146,7 @@ class Play(Base, Taggable, CollectionSearch):
try: try:
return load_list_of_blocks(ds=ds, play=self, variable_manager=self._variable_manager, loader=self._loader) return load_list_of_blocks(ds=ds, play=self, variable_manager=self._variable_manager, loader=self._loader)
except AssertionError as e: except AssertionError as e:
raise AnsibleParserError("A malformed block was encountered while loading tasks", obj=self._ds, orig_exc=e) raise AnsibleParserError("A malformed block was encountered while loading tasks: %s" % to_native(e), obj=self._ds, orig_exc=e)
def _load_pre_tasks(self, attr, ds): def _load_pre_tasks(self, attr, ds):
''' '''