Better SystemExit handling
This commit is contained in:
parent
1b312658e9
commit
0e6be3ad08
1 changed files with 2 additions and 5 deletions
|
|
@ -42,7 +42,6 @@ def get_user_name():
|
||||||
|
|
||||||
# Main section
|
# Main section
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
return_code = 0
|
|
||||||
# Set log
|
# Set log
|
||||||
try:
|
try:
|
||||||
global_vars['LogDir'] = '{}/Logs'.format(
|
global_vars['LogDir'] = '{}/Logs'.format(
|
||||||
|
|
@ -170,11 +169,9 @@ if __name__ == '__main__':
|
||||||
print_standard('\nDone.')
|
print_standard('\nDone.')
|
||||||
pause('Press Enter to exit...')
|
pause('Press Enter to exit...')
|
||||||
exit_script()
|
exit_script()
|
||||||
except SystemExit as e:
|
except SystemExit as sys_exit:
|
||||||
return_code = e.code
|
exit_script(sys_exit.code)
|
||||||
except:
|
except:
|
||||||
major_exception()
|
major_exception()
|
||||||
|
|
||||||
exit_script(return_code)
|
|
||||||
|
|
||||||
# vim: sts=2 sw=2 ts=2
|
# vim: sts=2 sw=2 ts=2
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue