codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix pluginmanagerbase to use configmanagers config directory instead of trying to get it from the config 

file.
This commit is contained in:
Andrew Resch 2008-04-08 03:56:27 +00:00
parent 7f89a8aff3
commit 4ead675fad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deluge/pluginmanagerbase.py
View File

@ -38,7 +38,7 @@ import os.path
import pkg_resources import pkg_resources
import deluge.common import deluge.common
from deluge.configmanager import ConfigManager import deluge.configmanager
from deluge.log import LOG as log from deluge.log import LOG as log
class PluginManagerBase: class PluginManagerBase:
@ -47,7 +47,7 @@ class PluginManagerBase:
def __init__(self, config_file, entry_name): def __init__(self, config_file, entry_name):
log.debug("Plugin manager init..") log.debug("Plugin manager init..")
self.config = ConfigManager(config_file) self.config = deluge.configmanager.ConfigManager(config_file)
# This is the entry we want to load.. # This is the entry we want to load..
self.entry_name = entry_name self.entry_name = entry_name
@ -82,7 +82,7 @@ class PluginManagerBase:
def scan_for_plugins(self): def scan_for_plugins(self):
"""Scans for available plugins""" """Scans for available plugins"""
plugin_dir = os.path.join(os.path.dirname(__file__), "plugins") plugin_dir = os.path.join(os.path.dirname(__file__), "plugins")
user_plugin_dir = os.path.join(self.config["config_location"], "plugins") user_plugin_dir = os.path.join(deluge.configmanager.get_config_dir(), "plugins")
pkg_resources.working_set.add_entry(plugin_dir) pkg_resources.working_set.add_entry(plugin_dir)
pkg_resources.working_set.add_entry(user_plugin_dir) pkg_resources.working_set.add_entry(user_plugin_dir)