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

force_exit() to make exit work with all fdroid build conditions

Browse source 
The build command has to use some threading stuff to handle the timeout and
locks.  This seems to prevent the command from exiting, unless this hack is
used.
This commit is contained in:
Hans-Christoph Steiner 2018-11-14 14:27:32 +01:00
parent 568256f75c
commit 1f346b3149
3 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fdroidserver/build.py
View file

@ -1148,7 +1148,7 @@ def main():
appid, reason))
if options.stop:
logging.debug("Error encoutered, stopping by user request.")
sys.exit(1)
common.force_exit(1)
failed_apps[appid] = vcse
wikilog = str(vcse)
except FDroidException as e:
@ -1163,7 +1163,7 @@ def main():
logging.error("Could not build app %s: %s" % (appid, e))
if options.stop:
logging.debug("Error encoutered, stopping by user request.")
sys.exit(1)
common.force_exit(1)
failed_apps[appid] = e
wikilog = e.get_wikitext()
except Exception as e:
@ -1171,7 +1171,7 @@ def main():
appid, traceback.format_exc()))
if options.stop:
logging.debug("Error encoutered, stopping by user request.")
sys.exit(1)
common.force_exit(1)
failed_apps[appid] = e
wikilog = str(e)
@ -1238,7 +1238,7 @@ def main():
if not os.path.isdir(repo_dir):
logging.critical("directory does not exists '{path}'".format(path=repo_dir))
sys.exit(1)
common.force_exit(1)
logging.info("Performing Drozer scan on {0}.".format(app))
docker.perform_drozer_scan(apk_path, app.id, repo_dir)
@ -1289,9 +1289,7 @@ def main():
newpage.save('#REDIRECT [[' + wiki_page_path + ']]', summary='Update redirect')
# hack to ensure this exits, even is some threads are still running
sys.stdout.flush()
sys.stderr.flush()
os._exit(0)
common.force_exit()
if __name__ == "__main__":