From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Sat, 20 Jan 2018 19:48:02 +0000 (+0100)
Subject: main: force exit on keyboard interrupt
X-Git-Tag: 1.0.1~34^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=a1a88e1c6aa8f01afe83aea484c770ef69f0ef06

main: force exit on keyboard interrupt

This applies the same workaround as b8ed892ad9ed7e125278b.
---

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 <http://www.gnu.org/licenses/>.
 
 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: