diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 15:35:56 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 15:35:56 +0000 |
| commit | 3f6880d465f9cf7c88f24e5b06eaca2c56730ce4 (patch) | |
| tree | c07e26cece3ef61bed80cf5fd5e2f8332027f3c2 | |
| parent | Merge pull request #6280 from matrix-org/erikj/receipts_async_await (diff) | |
| parent | Handle FileNotFound error in checking git repository version (#6284) (diff) | |
| download | synapse-3f6880d465f9cf7c88f24e5b06eaca2c56730ce4.tar.xz | |
Handle FileNotFound error in checking git repository version (#6284)
* commit 'b39ca49db': Handle FileNotFound error in checking git repository version (#6284)
| -rw-r--r-- | changelog.d/6284.bugfix | 1 | ||||
| -rw-r--r-- | synapse/util/versionstring.py | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/changelog.d/6284.bugfix b/changelog.d/6284.bugfix new file mode 100644 index 0000000000..cf15053d2d --- /dev/null +++ b/changelog.d/6284.bugfix @@ -0,0 +1 @@ +Prevent errors from appearing on Synapse startup if `git` is not installed. \ No newline at end of file diff --git a/synapse/util/versionstring.py b/synapse/util/versionstring.py index fa404b9d75..ab7d03af3a 100644 --- a/synapse/util/versionstring.py +++ b/synapse/util/versionstring.py @@ -42,6 +42,7 @@ def get_version_string(module): try: null = open(os.devnull, "w") cwd = os.path.dirname(os.path.abspath(module.__file__)) + try: git_branch = ( subprocess.check_output( @@ -51,7 +52,8 @@ def get_version_string(module): .decode("ascii") ) git_branch = "b=" + git_branch - except subprocess.CalledProcessError: + except (subprocess.CalledProcessError, FileNotFoundError): + # FileNotFoundError can arise when git is not installed git_branch = "" try: @@ -63,7 +65,7 @@ def get_version_string(module): .decode("ascii") ) git_tag = "t=" + git_tag - except subprocess.CalledProcessError: + except (subprocess.CalledProcessError, FileNotFoundError): git_tag = "" try: @@ -74,7 +76,7 @@ def get_version_string(module): .strip() .decode("ascii") ) - except subprocess.CalledProcessError: + except (subprocess.CalledProcessError, FileNotFoundError): git_commit = "" try: @@ -89,7 +91,7 @@ def get_version_string(module): ) git_dirty = "dirty" if is_dirty else "" - except subprocess.CalledProcessError: + except (subprocess.CalledProcessError, FileNotFoundError): git_dirty = "" if git_branch or git_tag or git_commit or git_dirty: |