diff options
| author | Ying Wang <wangying@android.com> | 2015-03-26 23:51:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-26 23:51:07 +0000 |
| commit | ac1da77e65f593869f389cf826fb28d19fc17860 (patch) | |
| tree | 8c5e1828fb3fe2d42345cc695e74100abc9994fa /core/tasks | |
| parent | 6c0618976c53d61fadf7d0b01eedb81f26206a69 (diff) | |
| parent | e6b9f2869110a35316022c639bf3d932034783d3 (diff) | |
| download | build-ac1da77e65f593869f389cf826fb28d19fc17860.tar.gz build-ac1da77e65f593869f389cf826fb28d19fc17860.tar.bz2 build-ac1da77e65f593869f389cf826fb28d19fc17860.zip | |
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
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 89d9ee827..5a0ec4016 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:])) |