Put lastbuild log on wiki by vercode (with redirect)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 9d7185b3be71586c2158b82aacac6973535208e9..7bacd4c061fedadf336a052381f40e49ee7dbd99 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -1067,9 +1067,14 @@ def main():
 
             if options.wiki and wikilog:
                 try:
-                    newpage = site.Pages[app['id'] + '/lastbuild']
+                    # Write a page with the last build log for this version code
+                    lastbuildpage = app['id'] + '/lastbuild_' + thisbuild['vercode']
+                    newpage = site.Pages[lastbuildpage]
                     txt = "Build completed at " + time.strftime("%Y-%m-%d %H:%M:%SZ", time.gmtime()) + "\n\n" + wikilog
                     newpage.save(txt, summary='Build log')
+                    # Redirect from /lastbuild to the most recent build log
+                    newpage = site.Pages[app['id'] + '/lastbuild']
+                    newpage.save('#REDIRECT [[' + lastbuildpage + ']]', summary='Update redirect')
                 except:
                     logging.error("Error while attempting to publish build log")
 

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index a1955e5b7ed765c219016590d1f4db40d8aaf44c..6df7f1fa0e5d709f6a0f289763ee5498036ac40a 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -144,7 +144,7 @@ def update_wiki(apps, apks):
                     buildfails = True
                     apklist.append({'versioncode': int(thisbuild['vercode']),
                                     'version': thisbuild['version'],
-                                    'buildproblem': "The build for this version appears to have failed. Check the [[{0}/lastbuild|build log]].".format(app['id'])
+                                    'buildproblem': "The build for this version appears to have failed. Check the [[{0}/lastbuild_{1}|build log]].".format(app['id'], thisbuild['vercode'])
                                     })
         if app['Current Version Code'] == '0':
             cantupdate = True