summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@android.com>2015-03-26 23:30:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-26 23:30:42 +0000
commitbc9ade722f2fe2d4dcc71931cdfd62661d822027 (patch)
treedbac64a718436bc863b362e1a8b2e9da10fc852b
parentabc748c11cbba71a99f306d318c74b5336b28730 (diff)
parentd5415dc778abffdf7a9abba52b093da7a20496be (diff)
downloadbuild-bc9ade722f2fe2d4dcc71931cdfd62661d822027.zip
build-bc9ade722f2fe2d4dcc71931cdfd62661d822027.tar.gz
build-bc9ade722f2fe2d4dcc71931cdfd62661d822027.tar.bz2
am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
* commit 'd5415dc778abffdf7a9abba52b093da7a20496be': Fix: exit code is 0 even when check-boot-jars.py fails
-rwxr-xr-xcore/tasks/check_boot_jars/check_boot_jars.py6
1 files changed, 3 insertions, 3 deletions
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 CheckJar(jar):
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 @@ def main(argv):
if __name__ == '__main__':
- main(sys.argv[1:])
+ sys.exit(main(sys.argv[1:]))