diff options
| author | Neil Johnson <neil@matrix.org> | 2019-01-30 10:28:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 10:28:08 +0000 |
| commit | ee4df7fd7a8d4ce7732ded1736f52d200d645f25 (patch) | |
| tree | 79dfebdef9ce6951a7f6e3b2b657a768ddf86ffc /synapse/rest/consent | |
| parent | define room dispositions for use in exposing room capabilities (diff) | |
| parent | Merge pull request #4486 from xperimental/workaround-4216 (diff) | |
| download | synapse-ee4df7fd7a8d4ce7732ded1736f52d200d645f25.tar.xz | |
Merge branch 'develop' into neilj/room_capabilities
Diffstat (limited to 'synapse/rest/consent')
| -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( |