summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2019-05-05 09:21:47 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-05 09:21:47 -0700
commit3ccd8c1b63e15244f876b5b32aa60dd5579be454 (patch)
tree8fedd86512ced59a9616b975912fbbd03e9762cb
parent7a616b3e1bfa1133b82a980e5e00b18cbc6530f7 (diff)
parent24a1d3db122964b18fecb855e458e8c90a9a06d9 (diff)
downloadTelecomm-temp_b_131756210_stage-aosp-master.tar.gz
Merge "Stop enforcing the AOSP preupload hook"temp_b_131756210_stage-aosp-master
am: 24a1d3db12 Change-Id: Ia5a00e1c3af39fd38c5133f9303aa3fa43ad51ce
-rwxr-xr-xscripts/aosp_tag_preupload.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/aosp_tag_preupload.py b/scripts/aosp_tag_preupload.py
index 8ec013ed4..77a971448 100755
--- a/scripts/aosp_tag_preupload.py
+++ b/scripts/aosp_tag_preupload.py
@@ -45,7 +45,7 @@ def main():
_check_aosp_message(commit_line)
print(ERROR_MESSAGE)
- sys.exit(1)
+ sys.exit(0)
def _is_in_aosp():
branch_info = subprocess.check_output(["git", "branch", "-vv"])
@@ -59,7 +59,7 @@ def _check_aosp_message(aosp_line):
sys.exit(0)
print(ERROR_MESSAGE)
- sys.exit(1)
+ sys.exit(0)
if __name__ == '__main__':
main()