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

fixed issue with subclasses across the repos clobbering each other, they

now merge
This commit is contained in:
Brian Coca 2014-11-04 20:54:55 -05:00
parent 2ba5c3c66b
commit 339d1ccc8b

View file

@ -135,7 +135,7 @@ def list_modules(module_dir, depth=0):
res = list_modules(d, depth + 1) res = list_modules(d, depth + 1)
for key in res.keys(): for key in res.keys():
if key in categories: if key in categories:
categories[key].update(res[key]) categories[key] = ansible.utils.merge_hash(categories[key], res[key])
res.pop(key, None) res.pop(key, None)
if depth < 2: if depth < 2: