mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-02 09:10:11 +02:00
main: force exit on keyboard interrupt
This applies the same workaround as b8ed892ad9
.
This commit is contained in:
parent
fa43066f8d
commit
a1a88e1c6a
6
fdroid
6
fdroid
@ -18,6 +18,7 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
import os
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import fdroidserver.common
|
import fdroidserver.common
|
||||||
@ -73,7 +74,6 @@ def main():
|
|||||||
print_help()
|
print_help()
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
elif command == '--version':
|
elif command == '--version':
|
||||||
import os.path
|
|
||||||
output = _('no version info found!')
|
output = _('no version info found!')
|
||||||
cmddir = os.path.realpath(os.path.dirname(__file__))
|
cmddir = os.path.realpath(os.path.dirname(__file__))
|
||||||
moduledir = os.path.realpath(os.path.dirname(fdroidserver.common.__file__) + '/..')
|
moduledir = os.path.realpath(os.path.dirname(fdroidserver.common.__file__) + '/..')
|
||||||
@ -143,7 +143,9 @@ def main():
|
|||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
print('')
|
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
|
# 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
|
# str(e) often doesn't contain a reason, so just show the backtrace
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
Loading…
Reference in New Issue
Block a user