mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: do not write/rsync status JSON when running --on-server

Browse source 
!717 !716
This commit is contained in:
Hans-Christoph Steiner 2020-02-20 09:02:39 +01:00
parent 7b8d358833
commit b5bce9f178
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/build.py
View file

@ -984,7 +984,10 @@ def main():
else: else:
also_check_dir = None also_check_dir = None
status_output = common.setup_status_output(start_timestamp) if options.onserver:
status_output = dict() # HACK dummy placeholder
else:
status_output = common.setup_status_output(start_timestamp)
repo_dir = 'repo' repo_dir = 'repo'
@ -1069,6 +1072,7 @@ def main():
tools_version_log = '' tools_version_log = ''
if not options.onserver: if not options.onserver:
tools_version_log = common.get_android_tools_version_log(build.ndk_path()) tools_version_log = common.get_android_tools_version_log(build.ndk_path())
common.write_running_status_json(status_output)
try: try:
# For the first build of a particular app, we need to set up # For the first build of a particular app, we need to set up
@ -1211,7 +1215,6 @@ def main():
except Exception as e: except Exception as e:
logging.error("Error while attempting to publish build log: %s" % e) logging.error("Error while attempting to publish build log: %s" % e)
common.write_running_status_json(status_output)
if timer: if timer:
timer.cancel() # kill the watchdog timer timer.cancel() # kill the watchdog timer
@ -1275,7 +1278,8 @@ def main():
newpage = site.Pages['build'] newpage = site.Pages['build']
newpage.save('#REDIRECT [[' + wiki_page_path + ']]', summary='Update redirect') newpage.save('#REDIRECT [[' + wiki_page_path + ']]', summary='Update redirect')
common.write_status_json(status_output) if not options.onserver:
common.write_status_json(status_output)
# hack to ensure this exits, even is some threads are still running # hack to ensure this exits, even is some threads are still running
common.force_exit() common.force_exit()