diff options
Diffstat (limited to 'heatclient/common')
| -rw-r--r-- | heatclient/common/template_utils.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/heatclient/common/template_utils.py b/heatclient/common/template_utils.py index 2a6504c..cf28aef 100644 --- a/heatclient/common/template_utils.py +++ b/heatclient/common/template_utils.py @@ -188,6 +188,12 @@ def normalise_file_path_to_url(path): def deep_update(old, new): '''Merge nested dictionaries.''' + + # Prevents an error if in a previous iteration + # old[k] = None but v[k] = {...}, + if old is None: + old = {} + for k, v in new.items(): if isinstance(v, collections.Mapping): r = deep_update(old.get(k, {}), v) |