summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-05-15 18:09:59 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-05-15 18:09:59 +0000
commit1ebb64a4250bfeab924f2678bfffc918869e9986 (patch)
tree9cc70c2eb6b2ce923369253643f3b36d3753e5ba
parent62a7fe4fc5bda30ca95c1f68022cd24892b888ff (diff)
downloaddeluge-1ebb64a4250bfeab924f2678bfffc918869e9986.tar.gz
deluge-1ebb64a4250bfeab924f2678bfffc918869e9986.tar.bz2
deluge-1ebb64a4250bfeab924f2678bfffc918869e9986.zip
Fix some config file locations when using a non-default config directory
-rw-r--r--deluge/core/core.py6
-rw-r--r--deluge/core/preferencesmanager.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/deluge/core/core.py b/deluge/core/core.py
index 7ca47d830..b20505035 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -297,7 +297,7 @@ class Core(
def save_session_state(self):
"""Saves the libtorrent session state"""
try:
- open(deluge.common.get_default_config_dir("session.state"), "wb").write(
+ open(deluge.configmanager.get_config_dir("session.state"), "wb").write(
lt.bencode(self.session.state()))
except Exception, e:
log.warning("Failed to save lt state: %s", e)
@@ -306,14 +306,14 @@ class Core(
"""Loads the libtorrent session state"""
try:
self.session.load_state(lt.bdecode(
- open(deluge.common.get_default_config_dir("session.state"), "rb").read()))
+ open(deluge.configmanager.get_config_dir("session.state"), "rb").read()))
except Exception, e:
log.warning("Failed to load lt state: %s", e)
def save_dht_state(self):
"""Saves the dht state to a file"""
try:
- dht_data = open(deluge.common.get_default_config_dir("dht.state"), "wb")
+ dht_data = open(deluge.configmanager.get_config_dir("dht.state"), "wb")
dht_data.write(lt.bencode(self.session.dht_state()))
dht_data.close()
except Exception, e:
diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py
index 64ccc2651..8bfc2671d 100644
--- a/deluge/core/preferencesmanager.py
+++ b/deluge/core/preferencesmanager.py
@@ -287,7 +287,7 @@ class PreferencesManager(component.Component):
def _on_set_dht(self, key, value):
log.debug("dht value set to %s", value)
- state_file = deluge.common.get_default_config_dir("dht.state")
+ state_file = deluge.configmanager.get_config_dir("dht.state")
if value:
state = None
try: