From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 27 Sep 2017 15:35:51 +0000 (+0200)
Subject: handle exceptions that send a tuple for the error message
X-Git-Tag: 0.9~56^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a4c4a16ed9a600b09ff7b62d78eaceb377cf3a9c;p=fdroidserver.git

handle exceptions that send a tuple for the error message

Running `fdroid verify` I was seeing FDroidExceptions from verify.py:98
that had a tuple rather than a string.


Traceback (most recent call last):
  File "/home/hans/code/fdroid/server/fdroid", line 152, in <module>
    main()
  File "/home/hans/code/fdroid/server/fdroid", line 128, in main
    mod.main()
  File "/home/hans/code/fdroid/server/fdroidserver/verify.py", line 98, in main
    logging.info("...NOT verified - {0}".format(e))
  File "/home/hans/code/fdroid/server/fdroidserver/exception.py", line 22, in __str__
    ret += "\n==== detail begin ====\n%s\n==== detail end ====" % ''.join(self.detail).strip()
TypeError: sequence item 1: expected str instance, HTTPError found
---

diff --git a/fdroidserver/exception.py b/fdroidserver/exception.py
index 61fa68bd..4a3570d2 100644
--- a/fdroidserver/exception.py
+++ b/fdroidserver/exception.py
@@ -19,7 +19,7 @@ class FDroidException(Exception):
     def __str__(self):
         ret = self.value
         if self.detail:
-            ret += "\n==== detail begin ====\n%s\n==== detail end ====" % self.detail.strip()
+            ret += "\n==== detail begin ====\n%s\n==== detail end ====" % ''.join(self.detail).strip()
         return ret