Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86 from matrix-org/v0.7.1-r2 

V0.7.1 r2
This commit is contained in:
Erik Johnston 2015-02-21 13:51:00 +00:00
parent 2b45ca1541 a87c56c673
commit b33a4cd6cc
2 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/__init__.py
View File

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

3
synapse/app/homeserver.py
View File

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