summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/m_dict.py
diff options
context:
space:
mode:
Diffstat (limited to 'cloudinit/mergers/m_dict.py')
-rw-r--r--cloudinit/mergers/m_dict.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/mergers/m_dict.py b/cloudinit/mergers/m_dict.py
index 45a7d3a5..929d3865 100644
--- a/cloudinit/mergers/m_dict.py
+++ b/cloudinit/mergers/m_dict.py
@@ -20,7 +20,7 @@
class Merger(object):
def __init__(self, merger, opts):
self._merger = merger
- self._overwrite = 'overwrite' in opts
+ self._not_overwrite = 'not_overwrite' in opts
# This merging algorithm will attempt to merge with
# another dictionary, on encountering any other type of object
@@ -39,7 +39,8 @@ class Merger(object):
merged = dict(value)
for (k, v) in merge_with.items():
if k in merged:
- if not self._overwrite:
+ if self._not_overwrite:
+ # Attempt to merge them....
merged[k] = self._merger.merge(merged[k], v)
else:
merged[k] = v