Apply upstream SystemExit fix to all scripts

This commit is contained in:
2Shirt 2019-04-20 18:59:43 -07:00
parent a0f4d74656
commit a0db819a76
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
7 changed files with 14 additions and 14 deletions

View file

@ -73,8 +73,8 @@ if __name__ == '__main__':
# Done # Done
exit_script() exit_script()
except SystemExit: except SystemExit as sys_exit:
pass exit_script(sys_exit.code)
except: except:
major_exception() major_exception()

View file

@ -20,8 +20,8 @@ if __name__ == '__main__':
install_eset_nod32_av(scan_pups) install_eset_nod32_av(scan_pups)
print_standard('\nDone.') print_standard('\nDone.')
exit_script() exit_script()
except SystemExit: except SystemExit as sys_exit:
pass exit_script(sys_exit.code)
except: except:
major_exception() major_exception()

View file

@ -38,7 +38,7 @@ 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: except SystemExit as sys_exit:
pass exit_script(sys_exit.code)
except: except:
major_exception() major_exception()

View file

@ -47,8 +47,8 @@ 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: except SystemExit as sys_exit:
pass exit_script(sys_exit.code)
except: except:
major_exception() major_exception()

View file

@ -47,7 +47,7 @@ if __name__ == '__main__':
# Done # Done
exit_script() exit_script()
except SystemExit: except SystemExit as sys_exit:
pass exit_script(sys_exit.code)
except: except:
major_exception() major_exception()

View file

@ -114,8 +114,8 @@ if __name__ == '__main__':
print_standard('\nDone.') print_standard('\nDone.')
pause('Press Enter exit...') pause('Press Enter exit...')
exit_script() exit_script()
except SystemExit: except SystemExit as sys_exit:
pass exit_script(sys_exit.code)
except: except:
major_exception() major_exception()

View file

@ -43,8 +43,8 @@ if __name__ == '__main__':
print_standard('Please reboot and try again.') print_standard('Please reboot and try again.')
pause('Press Enter to exit... ') pause('Press Enter to exit... ')
exit_script(1) exit_script(1)
except SystemExit: except SystemExit as sys_exit:
pass exit_script(sys_exit.code)
except: except:
major_exception() major_exception()