From a1a88e1c6aa8f01afe83aea484c770ef69f0ef06 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Sat, 20 Jan 2018 20:48:02 +0100 Subject: [PATCH] main: force exit on keyboard interrupt This applies the same workaround as b8ed892ad9ed7e125278b. --- fdroid | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fdroid b/fdroid index 74339df0..a66df6b1 100755 --- a/fdroid +++ b/fdroid @@ -18,6 +18,7 @@ # along with this program. If not, see . import sys +import os import logging import fdroidserver.common @@ -73,7 +74,6 @@ def main(): print_help() sys.exit(0) elif command == '--version': - import os.path output = _('no version info found!') cmddir = os.path.realpath(os.path.dirname(__file__)) moduledir = os.path.realpath(os.path.dirname(fdroidserver.common.__file__) + '/..') @@ -143,7 +143,9 @@ def main(): sys.exit(1) except KeyboardInterrupt: print('') - sys.exit(1) + sys.stdout.flush() + sys.stderr.flush() + os._exit(1) # These should only be unexpected crashes due to bugs in the code # str(e) often doesn't contain a reason, so just show the backtrace except Exception as e: -- 2.30.2