diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-03 14:46:20 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-03 14:46:20 -0400 |
| commit | 9eddc072644bf212d93b2247e1d121e3208546db (patch) | |
| tree | 33434690ef0f6f85227ad8b1107d0059a74da198 /cloudinit/mergers | |
| parent | 141a8329d7650b1e9c80364f289b7f399477e5fc (diff) | |
| parent | 141caf7f3b224c0265c7bb0014b96ca08aa67193 (diff) | |
| download | vyos-cloud-init-9eddc072644bf212d93b2247e1d121e3208546db.tar.gz vyos-cloud-init-9eddc072644bf212d93b2247e1d121e3208546db.zip | |
improved logging of errors around module loading/searching
Diffstat (limited to 'cloudinit/mergers')
| -rw-r--r-- | cloudinit/mergers/__init__.py | 10 |
1 files changed, 6 insertions, 4 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]) |