summary refs log tree commit diff
path: root/synapse/util/versionstring.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-08 11:24:53 +0100
committerErik Johnston <erik@matrix.org>2016-08-08 11:24:53 +0100
commit34101427417f58418a9587adfeca3d41898b5e24 (patch)
treef1cb2f39d3838b1dcf709c3f3921dbe82afdd3a5 /synapse/util/versionstring.py
parentUpdate changelog (diff)
parentMerge pull request #992 from matrix-org/erikj/psutil_conditional (diff)
downloadsynapse-34101427417f58418a9587adfeca3d41898b5e24.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'synapse/util/versionstring.py')
-rw-r--r--synapse/util/versionstring.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/util/versionstring.py b/synapse/util/versionstring.py
index a4f156cb3b..52086df465 100644
--- a/synapse/util/versionstring.py
+++ b/synapse/util/versionstring.py
@@ -21,7 +21,7 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-def get_version_string(name, module):
+def get_version_string(module):
     try:
         null = open(os.devnull, 'w')
         cwd = os.path.dirname(os.path.abspath(module.__file__))
@@ -74,11 +74,11 @@ def get_version_string(name, module):
             )
 
             return (
-                "%s/%s (%s)" % (
-                    name, module.__version__, git_version,
+                "%s (%s)" % (
+                    module.__version__, git_version,
                 )
             ).encode("ascii")
     except Exception as e:
         logger.info("Failed to check for git repository: %s", e)
 
-    return ("%s/%s" % (name, module.__version__,)).encode("ascii")
+    return module.__version__.encode("ascii")