Merge "Remove catch + sys.exit idiom" am: 14ec6f4157
Original change: https://android-review.googlesource.com/c/platform/build/+/1991316 Change-Id: I61a9033086d23b2ac6eb20c7ee8a822031633dd4
This commit is contained in:
@@ -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()
|
||||||
|
@@ -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()
|
||||||
|
@@ -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()
|
||||||
|
@@ -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()
|
||||||
|
@@ -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()
|
||||||
|
Reference in New Issue
Block a user