diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-20 23:54:49 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 23:54:49 +1000 |
| commit | 324525f40ca4df19c43971ca82db0d3478114885 (patch) | |
| tree | 05e6a1e45e711c9d5d18b7fbf31c79aa03fb0657 /synapse/util/versionstring.py | |
| parent | Merge pull request #3719 from matrix-org/erikj/use_cache_fact (diff) | |
| download | synapse-324525f40ca4df19c43971ca82db0d3478114885.tar.xz | |
Port over enough to get some sytests running on Python 3 (#3668)
Diffstat (limited to 'synapse/util/versionstring.py')
| -rw-r--r-- | synapse/util/versionstring.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/util/versionstring.py b/synapse/util/versionstring.py index 1fbcd41115..3baba3225a 100644 --- a/synapse/util/versionstring.py +++ b/synapse/util/versionstring.py @@ -30,7 +30,7 @@ def get_version_string(module): ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], stderr=null, cwd=cwd, - ).strip() + ).strip().decode('ascii') git_branch = "b=" + git_branch except subprocess.CalledProcessError: git_branch = "" @@ -40,7 +40,7 @@ def get_version_string(module): ['git', 'describe', '--exact-match'], stderr=null, cwd=cwd, - ).strip() + ).strip().decode('ascii') git_tag = "t=" + git_tag except subprocess.CalledProcessError: git_tag = "" @@ -50,7 +50,7 @@ def get_version_string(module): ['git', 'rev-parse', '--short', 'HEAD'], stderr=null, cwd=cwd, - ).strip() + ).strip().decode('ascii') except subprocess.CalledProcessError: git_commit = "" @@ -60,7 +60,7 @@ def get_version_string(module): ['git', 'describe', '--dirty=' + dirty_string], stderr=null, cwd=cwd, - ).strip().endswith(dirty_string) + ).strip().decode('ascii').endswith(dirty_string) git_dirty = "dirty" if is_dirty else "" except subprocess.CalledProcessError: @@ -77,8 +77,8 @@ def get_version_string(module): "%s (%s)" % ( module.__version__, git_version, ) - ).encode("ascii") + ) except Exception as e: logger.info("Failed to check for git repository: %s", e) - return module.__version__.encode("ascii") + return module.__version__ |