Merge "Remove catch + sys.exit idiom"

This commit is contained in:
Treehugger Robot 2022-02-25 00:35:45 +00:00 committed by Gerrit Code Review
commit 14ec6f4157
5 changed files with 0 additions and 15 deletions

View file

@ -181,8 +181,5 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
try: try:
main() main()
except AssertionError as err:
print('\n ERROR: %s\n' % (err,))
sys.exit(1)
finally: finally:
common.Cleanup() common.Cleanup()

View file

@ -300,8 +300,5 @@ if __name__ == "__main__":
try: try:
common.CloseInheritedPipes() common.CloseInheritedPipes()
main(sys.argv[1:]) main(sys.argv[1:])
except common.ExternalError:
logger.exception("\n ERROR:\n")
sys.exit(1)
finally: finally:
common.Cleanup() common.Cleanup()

View file

@ -286,8 +286,5 @@ if __name__ == '__main__':
try: try:
common.CloseInheritedPipes() common.CloseInheritedPipes()
main(sys.argv[1:]) main(sys.argv[1:])
except common.ExternalError:
logger.exception('\n ERROR:\n')
sys.exit(1)
finally: finally:
common.Cleanup() common.Cleanup()

View file

@ -251,8 +251,5 @@ if __name__ == '__main__':
try: try:
common.CloseInheritedPipes() common.CloseInheritedPipes()
main(sys.argv[1:]) main(sys.argv[1:])
except common.ExternalError as e:
logger.exception('\n ERROR:\n')
sys.exit(1)
finally: finally:
common.Cleanup() common.Cleanup()

View file

@ -175,8 +175,5 @@ def main(argv):
if __name__ == '__main__': if __name__ == '__main__':
try: try:
main(sys.argv[1:]) main(sys.argv[1:])
except common.ExternalError:
logger.exception("\n ERROR:\n")
sys.exit(1)
finally: finally:
common.Cleanup() common.Cleanup()