summaryrefslogtreecommitdiff
path: root/cloudinit/importer.py
diff options
context:
space:
mode:
authorBen Howard <ben.howard@canonical.com>2014-01-09 08:17:41 -0700
committerBen Howard <ben.howard@canonical.com>2014-01-09 08:17:41 -0700
commitdb215c30e7d7e9f9a9ffbe037beb6c92a2312b23 (patch)
tree884f06f8460f046ce8deadc8a09409e2d6dcf794 /cloudinit/importer.py
parenta5727fe1477c9cc4288d1ac41f70bd1ab7d7928a (diff)
parent3a4bf799ca2dd785fe1a5a35f188aed4f54ab5e5 (diff)
downloadvyos-cloud-init-db215c30e7d7e9f9a9ffbe037beb6c92a2312b23.tar.gz
vyos-cloud-init-db215c30e7d7e9f9a9ffbe037beb6c92a2312b23.zip
Merge with upstream sources
Diffstat (limited to 'cloudinit/importer.py')
-rw-r--r--cloudinit/importer.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/importer.py b/cloudinit/importer.py
index 71cf2726..a094141a 100644
--- a/cloudinit/importer.py
+++ b/cloudinit/importer.py
@@ -36,6 +36,7 @@ def find_module(base_name, search_paths, required_attrs=None):
found_places = []
if not required_attrs:
required_attrs = []
+ # NOTE(harlowja): translate the search paths to include the base name.
real_paths = []
for path in search_paths:
real_path = []
@@ -50,8 +51,9 @@ def find_module(base_name, search_paths, required_attrs=None):
mod = None
try:
mod = import_module(full_path)
- except ImportError:
- pass
+ except ImportError as e:
+ LOG.debug("Failed at attempted import of '%s' due to: %s",
+ full_path, e)
if not mod:
continue
found_attrs = 0