wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14214 from dvarrazzo/conflicting-actions-message

Browse source 
Better "conflicting action statements" message
This commit is contained in:
James Cammarata 2016-02-03 22:55:35 -05:00
commit 8ca8459af5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/parsing/mod_args.py
View file

@ -287,7 +287,7 @@ class ModuleArgsParser:
if item in module_loader or item == 'meta' or item == 'include':
# finding more than one module name is a problem
if action is not None:
raise AnsibleParserError("conflicting action statements", obj=self._task_ds)
raise AnsibleParserError("conflicting action statements (%s, %s)" % (action, item), obj=self._task_ds)
action = item
thing = value
action, args = self._normalize_parameters(value, action=action, additional_args=additional_args)