diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-10 11:04:37 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-10 11:04:37 +0000 |
commit | c86ebe76736a4cde48cfb3229d894a174c6bd379 (patch) | |
tree | afc236e8ef1bdbd6d0686747b99743661522638e /synapse/config/_base.py | |
parent | Oops, we do want to defer.return regardless of whether we are caching or not (diff) | |
parent | Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-c86ebe76736a4cde48cfb3229d894a174c6bd379.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Conflicts: synapse/app/homeserver.py synapse/state.py
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r-- | synapse/config/_base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index dfc115d8e8..9b0f8c3c32 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,8 +50,9 @@ class Config(object): ) return cls.abspath(file_path) - @staticmethod - def ensure_directory(dir_path): + @classmethod + def ensure_directory(cls, dir_path): + dir_path = cls.abspath(dir_path) if not os.path.exists(dir_path): os.makedirs(dir_path) if not os.path.isdir(dir_path): |