From 69d39bb30101e8fdca1d4369cd2fd3b0d8a6fbc1 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 20 Jan 2017 12:10:35 +0100 Subject: [PATCH] build: include fdroidserverid in build log post on wiki --- fdroidserver/build.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index e34fe15e..a100548a 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -1200,15 +1200,18 @@ def main(): failed_apps[appid] = e wikilog = str(e) - if wikilog: - wikilog = tools_version_log + '\n\n' + wikilog - if options.wiki and wikilog: try: # Write a page with the last build log for this version code lastbuildpage = appid + '/lastbuild_' + build.vercode newpage = site.Pages[lastbuildpage] - txt = "Build completed at " + time.strftime("%Y-%m-%d %H:%M:%SZ", time.gmtime()) + "\n\n" + wikilog + with open(os.path.join('tmp', 'fdroidserverid')) as fp: + fdroidserverid = fp.read() + txt = "* build completed at " + time.strftime("%Y-%m-%d %H:%M:%SZ", time.gmtime()) + '\n' \ + + '* fdroidserverid: [https://gitlab.com/fdroid/fdroidserver/commit/' \ + + fdroidserverid + ' ' + fdroidserverid + ']\n\n' \ + + tools_version_log + '\n\n' \ + + '== Build Log ==\n\n' + wikilog newpage.save(txt, summary='Build log') # Redirect from /lastbuild to the most recent build log newpage = site.Pages[appid + '/lastbuild']