Commit 751991b0 authored by Andrej Shadura's avatar Andrej Shadura

Refresh the pip patch

parent 9b45d4fc
......@@ -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 @@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment