diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:00:39 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:00:39 -0400 |
| commit | b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488 (patch) | |
| tree | 186d80c155d32f75d8efa3c6ec1ad3562f11ba0a /cloudinit/mergers | |
| parent | 26e6c265277cf5e29b8af311f2bb8759b0e811cd (diff) | |
| parent | b76866ad72d433cc9008a137c464c7ed44401549 (diff) | |
| download | vyos-cloud-init-b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488.tar.gz vyos-cloud-init-b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/mergers')
| -rw-r--r-- | cloudinit/mergers/__init__.py | 10 | ||||
| -rw-r--r-- | cloudinit/mergers/m_list.py | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cloudinit/mergers/__init__.py b/cloudinit/mergers/__init__.py index 650b42a9..03aa1ee1 100644 --- a/cloudinit/mergers/__init__.py +++ b/cloudinit/mergers/__init__.py @@ -143,12 +143,14 @@ def construct(parsed_mergers): for (m_name, m_ops) in parsed_mergers: if not m_name.startswith(MERGER_PREFIX): m_name = MERGER_PREFIX + str(m_name) - merger_locs = importer.find_module(m_name, - [__name__], - [MERGER_ATTR]) + merger_locs, looked_locs = importer.find_module(m_name, + [__name__], + [MERGER_ATTR]) if not merger_locs: msg = ("Could not find merger module named '%s' " - "with attribute '%s'") % (m_name, MERGER_ATTR) + "with attribute '%s' (searched %s)") % (m_name, + MERGER_ATTR, + looked_locs) raise ImportError(msg) else: mod = importer.import_module(merger_locs[0]) diff --git a/cloudinit/mergers/m_list.py b/cloudinit/mergers/m_list.py index 62999b4e..3b87b0fc 100644 --- a/cloudinit/mergers/m_list.py +++ b/cloudinit/mergers/m_list.py @@ -53,7 +53,7 @@ class Merger(object): def _on_list(self, value, merge_with): if (self._method == 'replace' and - not isinstance(merge_with, (tuple, list))): + not isinstance(merge_with, (tuple, list))): return merge_with # Ok we now know that what we are merging with is a list or tuple. |