From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 20 May 2013 20:19:53 +0000 (+0100)
Subject: Better build log formatting for wiki
X-Git-Tag: 0.1~583
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d832bf8e9ea54e970e783b6783797c30fca07671;p=fdroidserver.git

Better build log formatting for wiki
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index aa80bfcc..a5beabfb 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -677,7 +677,7 @@ def main():
                 if options.stop:
                     sys.exit(1)
                 failed_apps[app['id']] = be
-                wikilog = str(be)
+                wikilog = be.get_wikitext()
             except VCSException as vcse:
                 print "VCS error while building app %s: %s" % (app['id'], vcse)
                 if options.stop:
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 30662c4a..8f57d6e2 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -886,6 +886,20 @@ class BuildException(Exception):
         self.stdout = stdout
         self.stderr = stderr
 
+    def get_wikitext(self):
+        ret = repr(self.value) + "\n"
+        if self.stdout:
+            ret += "=stdout=\n"
+            ret += "<pre>\n"
+            ret += str(self.stdout)
+            ret += "</pre>\n"
+        if self.stderr:
+            ret += "=stderr=\n"
+            ret += "<pre>\n"
+            ret += str(self.stderr)
+            ret += "</pre>\n"
+        return ret
+
     def __str__(self):
         ret = repr(self.value)
         if self.stdout: