Refresh the pip patch
Andrej Shadura
5 years ago
| 4 | 4 | Origin: upstream |
| 5 | 5 | Bug: https://github.com/matrix-org/synapse/issues/3743 |
| 6 | 6 | --- |
| 7 | --- a/synapse/app/__init__.py | |
| 8 | +++ b/synapse/app/__init__.py | |
| 9 | @@ -25,8 +25,8 @@ | |
| 10 | except python_dependencies.MissingRequirementError as e: | |
| 11 | message = "\n".join([ | |
| 12 | "Missing Requirement: %s" % (str(e),), | |
| 13 | - "To install run:", | |
| 14 | - " pip install --upgrade --force \"%s\"" % (e.dependency,), | |
| 15 | + "To install, try:", | |
| 16 | + " sudo apt install python3-%s" % (e.dependency,), | |
| 17 | "", | |
| 18 | ]) | |
| 19 | sys.stderr.writelines(message) | |
| 7 | --- a/synapse/python_dependencies.py | |
| 8 | +++ b/synapse/python_dependencies.py | |
| 9 | @@ -92,14 +92,14 @@ | |
| 10 | return "\n".join([ | |
| 11 | "Missing Requirements: %s" % (", ".join(self.dependencies),), | |
| 12 | "To install run:", | |
| 13 | - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), | |
| 14 | + " sudo apt install %s" % (" ".join(self.dependencies),), | |
| 15 | "", | |
| 16 | ]) | |
| 17 | ||
| 18 | @property | |
| 19 | def dependencies(self): | |
| 20 | for i in self.args[0]: | |
| 21 | - yield '"' + i + '"' | |
| 22 | + yield 'python3-' + i | |
| 23 | ||
| 24 | ||
| 25 | def check_requirements(for_feature=None, _get_distribution=get_distribution): | |
| 20 | 26 | --- a/synapse/config/jwt_config.py |
| 21 | 27 | +++ b/synapse/config/jwt_config.py |
| 22 | 28 | @@ -19,7 +19,7 @@ |