diff options
| -rw-r--r-- | scripts/lib/wic/plugin.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py index 36a120bb1c..094a878e0f 100644 --- a/scripts/lib/wic/plugin.py +++ b/scripts/lib/wic/plugin.py @@ -31,7 +31,7 @@ logger = logging.getLogger('wic') class PluginMgr: _plugin_dirs = [] - _loaded = [] + _plugins = {} @classmethod def get_plugins(cls, ptype): @@ -39,6 +39,9 @@ class PluginMgr: if ptype not in PLUGIN_TYPES: raise WicError('%s is not valid plugin type' % ptype) + if ptype in cls._plugins: + return cls._plugins[ptype] + # collect plugin directories if not cls._plugin_dirs: cls._plugin_dirs = [os.path.join(os.path.dirname(__file__), 'plugins')] @@ -52,13 +55,12 @@ class PluginMgr: # load plugins for pdir in cls._plugin_dirs: ppath = os.path.join(pdir, ptype) - if ppath not in cls._loaded: - if os.path.isdir(ppath): - for fname in os.listdir(ppath): - if fname.endswith('.py'): - mname = fname[:-3] - mpath = os.path.join(ppath, fname) - SourceFileLoader(mname, mpath).load_module() - cls._loaded.append(ppath) + if os.path.isdir(ppath): + for fname in os.listdir(ppath): + if fname.endswith('.py'): + mname = fname[:-3] + mpath = os.path.join(ppath, fname) + SourceFileLoader(mname, mpath).load_module() - return pluginbase.get_plugins(ptype) + cls._plugins[ptype] = pluginbase.get_plugins(ptype) + return cls._plugins[ptype] |