Index: pluginconf.py ================================================================== --- pluginconf.py +++ pluginconf.py @@ -109,11 +109,11 @@ if decode: return bin.decode("utf-8", errors='ignore') else: return str(bin) except: - log_WARN("get_data() didn't find:", fn, "in", file_base) + pass#log_WARN("get_data() didn't find:", fn, "in", file_base) # Plugin name lookup # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -161,11 +161,11 @@ # find any plugins.* modules, or main packages if module: fn = module for base in plugin_base + extra_base: try: - src = get_data(fn+".py", decode=True, file_base=base) + src = get_data(fn=fn+".py", decode=True, file_base=base) if src: break except: continue # plugin_meta_extract() will print a notice later # Real filename/path @@ -379,16 +379,13 @@ # prepare list of known plugins and versions def __init__(self): self.have = all_plugin_meta() # dependencies on core modules are somewhat more interesting: - self.have.update({ - "streamtuner2": plugin_meta(module="st2", extra_base=["config"]), - "uikit": plugin_meta(module="uikit", extra_base=["config"]), - "config": plugin_meta(module="config", extra_base=["config"]), - "action": plugin_meta(module="action", extra_base=["config"]), - }) + for name in ("st2", "uikit", "config", "action"): + self.have[name] = plugin_meta(module=name, extra_base=["config"]) + self.have["streamtuner2"] = self.have["st2"] have = {} # depends: def depends(self, plugin): if plugin.get("depends"):