erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core (plugins): detect import_name conflicts

Browse source
This commit is contained in:
Goffi 2015-08-27 17:59:15 +02:00
commit 8deee28320
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/sat_main.py
View file

@ -145,7 +145,7 @@ class SAT(service.Service):
import sat.plugins
plugins_path = os.path.dirname(sat.plugins.__file__)
plug_lst = [os.path.splitext(plugin)[0] for plugin in map(os.path.basename, glob(os.path.join(plugins_path, "plugin*.py")))]
__plugins_to_import = {} # plugins we still have to import
plugins_to_import = {} # plugins we still have to import
for plug in plug_lst:
plugin_path = 'sat.plugins.' + plug
try:
@ -155,10 +155,14 @@ class SAT(service.Service):
continue
mod = sys.modules[plugin_path]
plugin_info = mod.PLUGIN_INFO
__plugins_to_import[plugin_info['import_name']] = (plugin_path, mod, plugin_info)
import_name = plugin_info['import_name']
if import_name in plugins_to_import:
log.error(_(u"Name conflict for import name [{import_name}], can't import plugin [{name}]").format(**plugin_info))
continue
plugins_to_import[import_name] = (plugin_path, mod, plugin_info)
while True:
self._import_plugins_from_dict(__plugins_to_import)
if not __plugins_to_import:
self._import_plugins_from_dict(plugins_to_import)
if not plugins_to_import:
break
def _import_plugins_from_dict(self, plugins_to_import, import_name=None, optional=False):