Commit aa762bb4 by James Cammarata

Don't split args out unless we're parsing module args using the new style

Fixes #12331
parent 1cb4e0be
...@@ -148,13 +148,12 @@ class ModuleArgsParser: ...@@ -148,13 +148,12 @@ class ModuleArgsParser:
else: else:
(action, args) = self._normalize_new_style_args(thing) (action, args) = self._normalize_new_style_args(thing)
# this can occasionally happen, simplify # this can occasionally happen, simplify
if args and 'args' in args: if args and 'args' in args:
tmp_args = args['args'] tmp_args = args.pop('args')
del args['args'] if isinstance(tmp_args, string_types):
if isinstance(tmp_args, string_types): tmp_args = parse_kv(tmp_args)
tmp_args = parse_kv(tmp_args) args.update(tmp_args)
args.update(tmp_args)
# finally, update the args we're going to return with the ones # finally, update the args we're going to return with the ones
# which were normalized above # which were normalized above
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment