cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Look for _get_parent_attribute method in both src and dst dict

Browse source 
When determining which getter style to use for the object in question,
the BaseMeta class should look at both dict's to try and locate the method.

Fixes #18522

(cherry picked from commit 4859e0a419)
This commit is contained in:
James Cammarata 2016-11-23 12:21:14 -06:00
parent f1f6752686
commit a60a7279d0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/playbook/base.py
View file

@ -111,7 +111,7 @@ class BaseMeta(type):
method = "_get_attr_%s" % attr_name method = "_get_attr_%s" % attr_name
if method in src_dict or method in dst_dict: if method in src_dict or method in dst_dict:
getter = partial(_generic_g_method, attr_name) getter = partial(_generic_g_method, attr_name)
elif '_get_parent_attribute' in dst_dict and value.inherit: elif ('_get_parent_attribute' in dst_dict or '_get_parent_attribute' in src_dict) and value.inherit:
getter = partial(_generic_g_parent, attr_name) getter = partial(_generic_g_parent, attr_name)
else: else:
getter = partial(_generic_g, attr_name) getter = partial(_generic_g, attr_name)