diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-04-18 13:29:39 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-04-18 13:29:39 -0700 |
| commit | 0eabf9cdc2870982bcabc6e5d05c80078fa100cb (patch) | |
| tree | caa3882e07efbebf2e8407bdbe3a5a890c841bb4 /cloudinit/mergers/dict.py | |
| parent | 6ad068d1ae175d784481fe8f8e190b2721a221f5 (diff) | |
| download | vyos-cloud-init-0eabf9cdc2870982bcabc6e5d05c80078fa100cb.tar.gz vyos-cloud-init-0eabf9cdc2870982bcabc6e5d05c80078fa100cb.zip | |
Adjust how merging is done.
Diffstat (limited to 'cloudinit/mergers/dict.py')
| -rw-r--r-- | cloudinit/mergers/dict.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/mergers/dict.py b/cloudinit/mergers/dict.py index 45a7d3a5..929d3865 100644 --- a/cloudinit/mergers/dict.py +++ b/cloudinit/mergers/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 |