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

Fixes #12331
pull/12336/head
James Cammarata 9 years ago
parent 1cb4e0be1c
commit aa762bb432

@ -148,13 +148,12 @@ class ModuleArgsParser:
else:
(action, args) = self._normalize_new_style_args(thing)
# this can occasionally happen, simplify
if args and 'args' in args:
tmp_args = args['args']
del args['args']
if isinstance(tmp_args, string_types):
tmp_args = parse_kv(tmp_args)
args.update(tmp_args)
# this can occasionally happen, simplify
if args and 'args' in args:
tmp_args = args.pop('args')
if isinstance(tmp_args, string_types):
tmp_args = parse_kv(tmp_args)
args.update(tmp_args)
# finally, update the args we're going to return with the ones
# which were normalized above

Loading…
Cancel
Save