1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Fix invocation from bad merge and note where it would need to go to keep

it out of registered vars as well.
This commit is contained in:
Toshio Kuratomi 2015-10-24 07:28:02 -07:00
parent 25e3fe04a8
commit 92dd563a75
2 changed files with 8 additions and 5 deletions

View file

@ -412,6 +412,12 @@ class TaskExecutor:
# do the final update of the local variables here, for both registered
# values and any facts which may have been created
if self._task.register:
### FIXME:
# If we remove invocation, we should also be removing _ansible*
# and maybe ansible_facts.
# Remove invocation from registered vars
#if 'invocation' in result:
# del result['invocation']
variables[self._task.register] = result
if 'ansible_facts' in result:

View file

@ -68,11 +68,8 @@ class CallbackBase:
keep_invocation = False
else:
keep_invocation = True
if not keep_invocation and 'invocation' in result:
del abridged_result['invocation']
# remove invocation info unless its very very verbose
if 'invocation' in abridged_result and self._display.verbosity < 3:
if not keep_invocation and 'invocation' in result:
del abridged_result['invocation']
return json.dumps(abridged_result, indent=indent, ensure_ascii=False, sort_keys=sort_keys)