diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-29 22:00:33 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-29 22:00:33 +0000 |
| commit | a696c48133d9f9a94f8b078aeacce0bef0d693b4 (patch) | |
| tree | 8137f14c734d351f52af038265103f275276646a /synapse/rest | |
| parent | Update synapse/storage/events_worker.py (diff) | |
| parent | Merge pull request #4483 from matrix-org/erikj/event_v2 (diff) | |
| download | synapse-a696c48133d9f9a94f8b078aeacce0bef0d693b4.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions_eiah
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/consent/consent_resource.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/synapse/rest/consent/consent_resource.py b/synapse/rest/consent/consent_resource.py index 80611cfe84..008d4edae5 100644 --- a/synapse/rest/consent/consent_resource.py +++ b/synapse/rest/consent/consent_resource.py @@ -101,16 +101,7 @@ class ConsentResource(Resource): "missing in config file.", ) - # daemonize changes the cwd to /, so make the path absolute now. - consent_template_directory = path.abspath( - hs.config.user_consent_template_dir, - ) - if not path.isdir(consent_template_directory): - raise ConfigError( - "Could not find template directory '%s'" % ( - consent_template_directory, - ), - ) + consent_template_directory = hs.config.user_consent_template_dir loader = jinja2.FileSystemLoader(consent_template_directory) self._jinja_env = jinja2.Environment( |