diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-09-02 13:31:18 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-09-02 13:31:18 -0700 |
| commit | 141caf7f3b224c0265c7bb0014b96ca08aa67193 (patch) | |
| tree | 92e23f731504ee7f2d9f2f31feb76b28179ae3b9 /cloudinit/sources/__init__.py | |
| parent | 128fd80cb0b27430def29bee7a8c473facd84be8 (diff) | |
| download | vyos-cloud-init-141caf7f3b224c0265c7bb0014b96ca08aa67193.tar.gz vyos-cloud-init-141caf7f3b224c0265c7bb0014b96ca08aa67193.zip | |
Remove/adjust the verbose 'failed at attempted import of' log
Instead of using this log (which really isn't a failure) we should
instead of just return the looked up locations and then if there really
is an error the caller can handle the usage of the looked up locations
as they choose fit.
Diffstat (limited to 'cloudinit/sources/__init__.py')
| -rw-r--r-- | cloudinit/sources/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py index 7d52a2e6..5d58bebd 100644 --- a/cloudinit/sources/__init__.py +++ b/cloudinit/sources/__init__.py @@ -272,9 +272,9 @@ def list_sources(cfg_list, depends, pkg_list): for ds_name in cfg_list: if not ds_name.startswith(DS_PREFIX): ds_name = '%s%s' % (DS_PREFIX, ds_name) - m_locs = importer.find_module(ds_name, - pkg_list, - ['get_datasource_list']) + m_locs, _looked_locs = importer.find_module(ds_name, + pkg_list, + ['get_datasource_list']) for m_loc in m_locs: mod = importer.import_module(m_loc) lister = getattr(mod, "get_datasource_list") |