From be8421f603bdee5dad716d87dd6691f3aef5fed7 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 7 Sep 2018 13:57:56 +0100
Subject: Avoid telling people to install packages with pip

Origin: upstream
Bug: https://github.com/matrix-org/synapse/issues/3743

Gbp-Pq: Name 0006-Avoid-pip-install.patch
---
 synapse/app/__init__.py      | 4 ++--
 synapse/config/jwt_config.py | 2 +-
 synapse/config/repository.py | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py
index c3afcc57..05075566 100644
--- a/synapse/app/__init__.py
+++ b/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 install python3-%s" % (e.dependency,),
         "",
     ])
     sys.stderr.writelines(message)
diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py
index 51e7f7e0..91c43cf6 100644
--- a/synapse/config/jwt_config.py
+++ b/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 install python3-jwt
     """
 )
 
diff --git a/synapse/config/repository.py b/synapse/config/repository.py
index 06c62ab6..7cb98c64 100644
--- a/synapse/config/repository.py
+++ b/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 install python3-lxml
     """
 )
 
-- 
cgit v1.2.3