Franck Pommereau

fixed plugin loading twice

...@@ -162,6 +162,8 @@ def plugin (base, depends=[], conflicts=[]) : ...@@ -162,6 +162,8 @@ def plugin (base, depends=[], conflicts=[]) :
162 conf = set(conflicts) & loaded 162 conf = set(conflicts) & loaded
163 if len(conf) > 0 : 163 if len(conf) > 0 :
164 raise ValueError("plugin conflict (%s)" % ", ".join(conf)) 164 raise ValueError("plugin conflict (%s)" % ", ".join(conf))
165 + if fun.__module__ in loaded :
166 + return module
165 objects = fun(module) 167 objects = fun(module)
166 if type(objects) is not tuple : 168 if type(objects) is not tuple :
167 objects = (objects,) 169 objects = (objects,)
......