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 61fa68bd50851f4b63e04ce8375a2086d280c179..4a3570d212463094cba81ce041c42fdcc8d8d7b3 100644 (file)
--- 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