Merge "Remove catch + sys.exit idiom" am: 14ec6f4157 am: f5d885e873

Original change: https://android-review.googlesource.com/c/platform/build/+/1991316

Change-Id: I156db81c998f756ef817d17f2b9d627b6418b81e
This commit is contained in:
Treehugger Robot
2022-02-25 01:26:03 +00:00
committed by Automerger Merge Worker
5 changed files with 0 additions and 15 deletions

View File

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

View File

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

View File

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

View File

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

View File

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