summary refs log tree commit diff
path: root/synapse/config/repository.py
diff options
context:
space:
mode:
authorJacek KuĊ›nierz <jacek.kusnierz@tum.de>2022-06-30 19:48:04 +0200
committerGitHub <noreply@github.com>2022-06-30 19:48:04 +0200
commit50f0e4028b334566a067b671d15246a9b05e8498 (patch)
treeb2fee0ce8dc2b1f81a73cf87167c8c747092ecda /synapse/config/repository.py
parentMerge remote-tracking branch 'origin/release-v1.62' into develop (diff)
downloadsynapse-50f0e4028b334566a067b671d15246a9b05e8498.tar.xz
Allow dependency errors to pass through (#13113)
Signed-off-by: Jacek Kusnierz <jacek.kusnierz@tum.de>
Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
Diffstat (limited to 'synapse/config/repository.py')
-rw-r--r--synapse/config/repository.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py
index aadec1e54e..3c69dd325f 100644
--- a/synapse/config/repository.py
+++ b/synapse/config/repository.py
@@ -21,7 +21,7 @@ import attr
 
 from synapse.config.server import generate_ip_set
 from synapse.types import JsonDict
-from synapse.util.check_dependencies import DependencyException, check_requirements
+from synapse.util.check_dependencies import check_requirements
 from synapse.util.module_loader import load_module
 
 from ._base import Config, ConfigError
@@ -184,13 +184,7 @@ class ContentRepositoryConfig(Config):
         )
         self.url_preview_enabled = config.get("url_preview_enabled", False)
         if self.url_preview_enabled:
-            try:
-                check_requirements("url_preview")
-
-            except DependencyException as e:
-                raise ConfigError(
-                    e.message  # noqa: B306, DependencyException.message is a property
-                )
+            check_requirements("url_preview")
 
             proxy_env = getproxies_environment()
             if "url_preview_ip_range_blacklist" not in config: