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

now merge
2014-11-04 20:54:55 -05:00 · 2014-11-04 20:54:55 -05:00 · 339d1ccc8b
commit 339d1ccc8b
parent 2ba5c3c66b
1 changed files with 1 additions and 1 deletions
--- a/hacking/module_formatter.py
+++ b/hacking/module_formatter.py
@ -135,7 +135,7 @@ def list_modules(module_dir, depth=0):
                res = list_modules(d, depth + 1)
                for key in res.keys():
                    if key in categories:
-                        categories[key].update(res[key])
+                        categories[key] = ansible.utils.merge_hash(categories[key], res[key])
                        res.pop(key, None)

                if depth < 2: