diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-05 16:59:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 16:59:16 +0100 |
| commit | 6bf6bc1d1dab659f99a1690aaa4246b85597c6ed (patch) | |
| tree | 10bd894af6d1759d9bedd50a0f801eaeeb6cb58e /synapse/util/versionstring.py | |
| parent | Print newline after result in federation_client script (diff) | |
| parent | Add federation /version API (diff) | |
| download | synapse-6bf6bc1d1dab659f99a1690aaa4246b85597c6ed.tar.xz | |
Merge pull request #990 from matrix-org/erikj/fed_vers
Add federation /version API
Diffstat (limited to 'synapse/util/versionstring.py')
| -rw-r--r-- | synapse/util/versionstring.py | 8 |
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") |