Merge branch 'master' of github.com:matrix-org/synapse into develop

README.rst

@@ -118,6 +118,7 @@ environment under ``~/.synapse``.
 
 To set up your homeserver, run (in your virtualenv, as before)::
 
+    $ cd ~/.synapse
     $ python -m synapse.app.homeserver \
         --server-name machine.my.domain.name \
         --config-path homeserver.yaml \
@@ -179,6 +180,7 @@ installing under virtualenv)::
     
 During setup of homeserver you need to call python2.7 directly again::
 
+    $ cd ~/.synapse
     $ python2.7 -m synapse.app.homeserver \
       --server-name machine.my.domain.name \
       --config-path homeserver.yaml \

synapse/__init__.py

@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.7.1-r1"
+__version__ = "0.7.1-r4"

synapse/app/homeserver.py

@@ -219,6 +219,7 @@ class SynapseHomeServer(HomeServer):
 
 
 def get_version_string():
+    try:
         null = open(os.devnull, 'w')
         cwd = os.path.dirname(os.path.abspath(__file__))
         try:
@@ -274,6 +275,8 @@ def get_version_string():
                     synapse.__version__, git_version,
                 )
             ).encode("ascii")
+    except Exception as e:
+        logger.warn("Failed to check for git repository: %s", e)
 
     return ("Synapse/%s" % (synapse.__version__,)).encode("ascii")