diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-12-11 04:14:34 +1100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-12-20 11:15:52 +0000 |
| commit | fd4070a85dc4ece77f2427b586c18bb1f4a04197 (patch) | |
| tree | 2f10f1098e20c3a1c8d44d3bdee6da074665f7b5 /debian/patches/no_install_with_pip | |
| parent | 0.34.0rc2 (diff) | |
| download | synapse-fd4070a85dc4ece77f2427b586c18bb1f4a04197.tar.xz | |
import from package-debian-synapse
Diffstat (limited to 'debian/patches/no_install_with_pip')
| -rw-r--r-- | debian/patches/no_install_with_pip | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/debian/patches/no_install_with_pip b/debian/patches/no_install_with_pip new file mode 100644 index 0000000000..654656f596 --- /dev/null +++ b/debian/patches/no_install_with_pip @@ -0,0 +1,43 @@ +Index: package-synapse-debian/synapse/app/__init__.py +=================================================================== +--- package-synapse-debian.orig/synapse/app/__init__.py ++++ package-synapse-debian/synapse/app/__init__.py +@@ -25,8 +25,8 @@ try: + 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-get install python-%s" % (e.dependency,), + "", + ]) + sys.stderr.writelines(message) +Index: package-synapse-debian/synapse/config/jwt_config.py +=================================================================== +--- package-synapse-debian.orig/synapse/config/jwt_config.py ++++ package-synapse-debian/synapse/config/jwt_config.py +@@ -19,7 +19,7 @@ MISSING_JWT = ( + """Missing jwt library. This is required for jwt login. + + Install by running: +- pip install pyjwt ++ sudo apt-get install python-jwt + """ + ) + +Index: package-synapse-debian/synapse/config/repository.py +=================================================================== +--- package-synapse-debian.orig/synapse/config/repository.py ++++ package-synapse-debian/synapse/config/repository.py +@@ -27,9 +27,7 @@ MISSING_LXML = ( + """Missing lxml library. This is required for URL preview API. + + Install by running: +- pip install lxml +- +- Requires libxslt1-dev system package. ++ sudo apt-get install python-lxml + """ + ) + |