ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-02 20:24:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Pass obj=data to AnsibleParserError for context in IncludeRole. Fixes #31374 (#39805)

Browse source
This commit is contained in:
Matt Martz 2018-05-07 11:25:28 -05:00 • committed by GitHub
commit 5ec34f65d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/playbook/role_include.py
View file

@ -112,12 +112,12 @@ class IncludeRole(TaskInclude):
# name is needed, or use role as alias # name is needed, or use role as alias
ir._role_name = ir.args.get('name', ir.args.get('role')) ir._role_name = ir.args.get('name', ir.args.get('role'))
if ir._role_name is None: if ir._role_name is None:
raise AnsibleParserError("'name' is a required field for %s." % ir.action) raise AnsibleParserError("'name' is a required field for %s." % ir.action, obj=data)
# validate bad args, otherwise we silently ignore # validate bad args, otherwise we silently ignore
bad_opts = my_arg_names.difference(IncludeRole.VALID_ARGS) bad_opts = my_arg_names.difference(IncludeRole.VALID_ARGS)
if bad_opts: if bad_opts:
raise AnsibleParserError('Invalid options for %s: %s' % (ir.action, ','.join(list(bad_opts)))) raise AnsibleParserError('Invalid options for %s: %s' % (ir.action, ','.join(list(bad_opts))), obj=data)
# build options for role includes # build options for role includes
for key in my_arg_names.intersection(IncludeRole.FROM_ARGS): for key in my_arg_names.intersection(IncludeRole.FROM_ARGS):