diff options
| author | Ying Wang <wangying@android.com> | 2015-03-26 23:37:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-26 23:37:47 +0000 |
| commit | e6b9f2869110a35316022c639bf3d932034783d3 (patch) | |
| tree | dbbbafb0b1c44c85e9b3bd9b0c6ded021946e372 /core/tasks | |
| parent | b595d5a330dc349888e8fe155f4171bcd8a2845f (diff) | |
| parent | bc9ade722f2fe2d4dcc71931cdfd62661d822027 (diff) | |
| download | build-e6b9f2869110a35316022c639bf3d932034783d3.zip build-e6b9f2869110a35316022c639bf3d932034783d3.tar.gz build-e6b9f2869110a35316022c639bf3d932034783d3.tar.bz2 | |
am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"
* commit 'bc9ade722f2fe2d4dcc71931cdfd62661d822027':
Fix: exit code is 0 even when check-boot-jars.py fails
Diffstat (limited to 'core/tasks')
| -rwxr-xr-x | core/tasks/check_boot_jars/check_boot_jars.py | 6 |
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:])) |