mirror of
https://github.com/f-droid/fdroidserver.git
synced 2026-05-05 22:36:15 -04:00
main: force exit on keyboard interrupt
This applies the same workaround as b8ed892ad9.
This commit is contained in:
6
fdroid
6
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:
|
||||
|
||||
Reference in New Issue
Block a user