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

improve error message on conflicting actions. Fixes #21057 (#21059)

Browse source 
* this fixes #21057

outputs the conflicting action statements.

* reverting to old  % syntax for python 2.6 compatibility
This commit is contained in:
Daniel Brachmann 2017-02-06 23:48:06 +01:00 committed by John R Barker
parent c6a5d9c8bf
commit b9334f9f47
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 in ['meta', 'include', 'include_role']:
# 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(thing, action=action, additional_args=additional_args)