From d9088c923f32fe1d2b6027320bb8fd5e46e1a428 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 25 Aug 2015 13:34:50 +0100
Subject: Remove dependency on matrix-angular-sdk

---
 synapse/app/homeserver.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'synapse/app')

diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 2c59457cda..6255e9676e 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -99,7 +99,14 @@ class SynapseHomeServer(HomeServer):
     def build_resource_for_web_client(self):
         webclient_path = self.get_config().web_client_location
         if not webclient_path:
-            import syweb
+            try:
+                import syweb
+            except ImportError:
+                quit_with_error(
+                    "Could not find a webclient. Please either install syweb\n"
+                    "or configure the location of the source to server via\n"
+                    "the config option `web_client_location`"
+                )
             syweb_path = os.path.dirname(syweb.__file__)
             webclient_path = os.path.join(syweb_path, "webclient")
         # GZip is disabled here due to
-- 
cgit 1.5.1