chiark / gitweb /
main: force exit on keyboard interrupt
authorMarcus Hoffmann <bubu@bubu1.eu>
Sat, 20 Jan 2018 19:48:02 +0000 (20:48 +0100)
committerMarcus Hoffmann <bubu@bubu1.eu>
Mon, 22 Jan 2018 15:02:49 +0000 (16:02 +0100)
This applies the same workaround as b8ed892ad9ed7e125278b.

fdroid

diff --git a/fdroid b/fdroid
index 74339df00f8348aec0009ff3ff981daa0a41b4bf..a66df6b10098f49b577b02e9ae654bb3c4e29d27 100755 (executable)
--- 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: