From a9b7f881094d4645cad6f2603ff879749ba06813 Mon Sep 17 00:00:00 2001 From: Armin Date: Sat, 4 Apr 2015 14:36:14 +0200 Subject: fix plugin location --- pyload/manager/Plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pyload/manager/Plugin.py') diff --git a/pyload/manager/Plugin.py b/pyload/manager/Plugin.py index 08fbcc953..31396d010 100644 --- a/pyload/manager/Plugin.py +++ b/pyload/manager/Plugin.py @@ -37,14 +37,14 @@ class PluginManager(object): def loadTypes(self): - rootdir = join(pypath, "pyload", "plugins") + rootdir = join(pypath, "pyload", "plugin") userdir = "userplugins" types = set().union(*[[d for d in listdir(p) if isdir(join(p, d))] for p in (rootdir, userdir) if exists(p)]) if not types: - self.log.critical(_("No plugins found!")) + self.core.log.critical(_("No plugins found!")) self.TYPES = list(set(self.TYPES) | types) -- cgit v1.2.3 From 31703cf260effc526f584fe28841881d26347c0b Mon Sep 17 00:00:00 2001 From: Armin Date: Sat, 4 Apr 2015 14:40:40 +0200 Subject: fix again --- pyload/manager/Plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyload/manager/Plugin.py') diff --git a/pyload/manager/Plugin.py b/pyload/manager/Plugin.py index 31396d010..72fabb33a 100644 --- a/pyload/manager/Plugin.py +++ b/pyload/manager/Plugin.py @@ -90,7 +90,7 @@ class PluginManager(object): return rootplugins else: - pfolder = join(pypath, "pyload", "plugins", folder) + pfolder = join(pypath, "pyload", "plugin", folder) for f in listdir(pfolder): if isfile(join(pfolder, f)) and f.endswith(".py") and not f.startswith("_"): -- cgit v1.2.3