From a30ed783da379f4085ec24309002aaa23b8b60e8 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 18 Apr 2020 20:33:30 +0200
Subject: [PATCH] Improve message about error 500

---
 src/yunohost/diagnosis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/yunohost/diagnosis.py b/src/yunohost/diagnosis.py
index aba65a619..f7d2830b6 100644
--- a/src/yunohost/diagnosis.py
+++ b/src/yunohost/diagnosis.py
@@ -525,7 +525,7 @@ class Diagnoser():
             socket.getaddrinfo = old_getaddrinfo
 
         if r.status_code not in [200, 400]:
-            raise Exception("Bad response from diagnosis server.\nURL: %s\nStatus code: %s\nMessage: %s" % (url, r.status_code, r.content))
+            raise Exception("The remote diagnosis server failed miserably while trying to diagnose your server. This is most likely an error on Yunohost's infrastructure and not on your side. Please contact the YunoHost team an provide them with the following information.\nURL: <pre>%s</pre>\nStatus code: <pre>%s</pre>" % (url, r.status_code))
         if r.status_code == 400:
             raise Exception("Diagnosis request was refused: %s" % r.content)