diff options
| author | Andrej Shadura <andrewsh@debian.org> | 2019-01-10 16:31:31 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2019-01-10 16:31:31 +0100 |
| commit | 751991b074d8d593feb65af5b1deabe09b8cd698 (patch) | |
| tree | 73ee93c9883c35366d127545df252db6907da861 | |
| parent | 9b45d4fcdb456585d3e7f62163856a0668bed40c (diff) | |
Refresh the pip patchdebian/0.34.1.1-1
| -rw-r--r-- | debian/patches/0006-Avoid-pip-install.patch | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/debian/patches/0006-Avoid-pip-install.patch b/debian/patches/0006-Avoid-pip-install.patch index edd07301..2813736e 100644 --- a/debian/patches/0006-Avoid-pip-install.patch +++ b/debian/patches/0006-Avoid-pip-install.patch @@ -5,19 +5,25 @@ Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 --- ---- a/synapse/app/__init__.py -+++ b/synapse/app/__init__.py -@@ -25,8 +25,8 @@ - except python_dependencies.MissingRequirementError as e: - message = "\n".join([ - "Missing Requirement: %s" % (str(e),), -- "To install run:", -- " pip install --upgrade --force \"%s\"" % (e.dependency,), -+ "To install, try:", -+ " sudo apt install python3-%s" % (e.dependency,), - "", - ]) - sys.stderr.writelines(message) +--- a/synapse/python_dependencies.py ++++ b/synapse/python_dependencies.py +@@ -92,14 +92,14 @@ + return "\n".join([ + "Missing Requirements: %s" % (", ".join(self.dependencies),), + "To install run:", +- " pip install --upgrade --force %s" % (" ".join(self.dependencies),), ++ " sudo apt install %s" % (" ".join(self.dependencies),), + "", + ]) + + @property + def dependencies(self): + for i in self.args[0]: +- yield '"' + i + '"' ++ yield 'python3-' + i + + + def check_requirements(for_feature=None, _get_distribution=get_distribution): --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ |