summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 10:35:13 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 10:35:13 +0000
commit5758dafb4e8c28ed3a19b352798bac7e3ff619e3 (patch)
treef6427195438c7e1e076ee4a0124f403a5ad26b1a /synapse/app
parentMerge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff)
parentFix bug where variable was not always defined (diff)
downloadsynapse-5758dafb4e8c28ed3a19b352798bac7e3ff619e3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index 2b17cae54f..f5681fac20 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py
@@ -134,7 +134,7 @@ class SynapseHomeServer(HomeServer): logger.info("Attaching %s to path %s", resource, full_path) last_resource = self.root_resource for path_seg in full_path.split('/')[1:-1]: - if not path_seg in last_resource.listNames(): + if path_seg not in last_resource.listNames(): # resource doesn't exist, so make a "dummy resource" child_resource = Resource() last_resource.putChild(path_seg, child_resource)