Merge pull request #7083 from mscherer/better_message_multiple_action

Improve error message when multiple action are given
This commit is contained in:
James Cammarata 2014-04-21 10:53:55 -05:00
commit 4f673b9497

View file

@ -68,7 +68,7 @@ class Task(object):
if x in utils.plugins.module_finder: if x in utils.plugins.module_finder:
if 'action' in ds: if 'action' in ds:
raise errors.AnsibleError("multiple actions specified in task %s" % (ds.get('name', ds['action']))) raise errors.AnsibleError("multiple actions specified in task: '%s' and '%s'" % (x, ds.get('name', ds['action'])))
if isinstance(ds[x], dict): if isinstance(ds[x], dict):
if 'args' in ds: if 'args' in ds:
raise errors.AnsibleError("can't combine args: and a dict for %s: in task %s" % (x, ds.get('name', "%s: %s" % (x, ds[x])))) raise errors.AnsibleError("can't combine args: and a dict for %s: in task %s" % (x, ds.get('name', "%s: %s" % (x, ds[x]))))