diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-07 22:22:18 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-07 22:22:18 +0200 |
| commit | d2fe85670726901da627490da4155af972c1a62e (patch) | |
| tree | b8931d070a51b6d8b1dabe881f54504f9d9ef6de /pyload/manager | |
| parent | Update user-agent (diff) | |
| parent | fix gui (diff) | |
| download | pyload-d2fe85670726901da627490da4155af972c1a62e.tar.xz | |
Merge branch 'pr/n1_ardi69' into 0.4.10
Diffstat (limited to 'pyload/manager')
| -rw-r--r-- | pyload/manager/Plugin.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pyload/manager/Plugin.py b/pyload/manager/Plugin.py index 08fbcc953..72fabb33a 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) @@ -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("_"): |