[fix] recursive merge for entries that are empty dictionaries

2016-11-16 02:14:28 -05:00
parent b03494a736
commit 3617b3a10c
2 changed files with 3 additions and 2 deletions
--- a/scripts/geodata/configs/utils.py
+++ b/scripts/geodata/configs/utils.py
@@ -4,7 +4,7 @@ from collections import Mapping

 def recursive_merge(a, b):
    for k, v in six.iteritems(b):
-        if isinstance(v, Mapping):
+        if isinstance(v, Mapping) and v:
            existing = a.get(k, v)
            merged = recursive_merge(existing, v)
            a[k] = merged