commit ac1da77e65f593869f389cf826fb28d19fc17860
author Ying Wang <wangying@android.com> Thu Mar 26 23:51:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 26 23:51:07 2015 +0000
tree 8c5e1828fb3fe2d42345cc695e74100abc9994fa
parent 6c0618976c53d61fadf7d0b01eedb81f26206a69
parent e6b9f2869110a35316022c639bf3d932034783d3

am e6b9f286: am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"

* commit 'e6b9f2869110a35316022c639bf3d932034783d3':
  Fix: exit code is 0 even when check-boot-jars.py fails

core/tasks/check_boot_jars/check_boot_jars.py

diff --git a/core/tasks/check_boot_jars/check_boot_jars.py b/core/tasks/check_boot_jars/check_boot_jars.py
index 89d9ee8..5a0ec40 100755
--- a/core/tasks/check_boot_jars/check_boot_jars.py
+++ b/core/tasks/check_boot_jars/check_boot_jars.py
@@ -64,10 +64,10 @@
 def main(argv):
   if len(argv) < 2:
     print __doc__
-    sys.exit(1)
+    return 1
 
   if not LoadWhitelist(argv[0]):
-    sys.exit(1)
+    return 1
 
   passed = True
   for jar in argv[1:]:
@@ -80,4 +80,4 @@
 
 
 if __name__ == '__main__':
-  main(sys.argv[1:])
+  sys.exit(main(sys.argv[1:]))