Rooba
/
mitogen
mirror of https://github.com/mitogen-hq/mitogen.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove_internal_keys returns None, so need different way to check fallback

This commit is contained in:
Steven Robertson 2020-02-11 18:08:02 -08:00
parent 722cf0ea8d
commit ee310c1a68
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible_mitogen/mixins.py
View File

@ -69,7 +69,7 @@ except ImportError:
except ImportError:
# ansible 2.3.3 has remove_internal_keys as a protected func on the action class
# we'll fallback to calling self._remove_internal_keys in this case
remove_internal_keys = lambda a: None
remove_internal_keys = lambda a: "Not found"
LOG = logging.getLogger(__name__)
@ -392,7 +392,9 @@ class ActionModuleMixin(ansible.plugins.action.ActionBase):
# prevents things like discovered_interpreter_* or ansible_discovered_interpreter_* from being set
# handle ansible 2.3.3 that has remove_internal_keys in a different place
remove_internal_keys(result) or self._remove_internal_keys(result)
check = remove_internal_keys(result)
if check == 'Not found':
self._remove_internal_keys(result)
# taken from _execute_module of ansible 2.8.6
# propagate interpreter discovery results back to the controller