| commit | 099613d389b453b34c2a4d17e691f6cf09eca450 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Mon Apr 19 23:02:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 19 23:02:54 2021 +0000 |
| tree | 0ed45f13b7afb1cbd0699f36d51960f4a98a1cc6 | |
| parent | dc3e062e358ab22feeaa02e29a9a422933472f34 [diff] | |
| parent | 2a81f7cc184d30f291a198617f054db8a352deaf [diff] |
Merge "Fix py3 error in aosp checker" am: 2a81f7cc18 Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1679713 Change-Id: I8618e28b6ab220d9f10beaf5374cc8113bb90148
diff --git a/scripts/aosp_tag_preupload.py b/scripts/aosp_tag_preupload.py index 77a9714..17f5058 100755 --- a/scripts/aosp_tag_preupload.py +++ b/scripts/aosp_tag_preupload.py
@@ -49,7 +49,7 @@ def _is_in_aosp(): branch_info = subprocess.check_output(["git", "branch", "-vv"]) - return re.search(AOSP_BRANCH_REGEX, branch_info) is not None + return re.search(AOSP_BRANCH_REGEX, str(branch_info)) is not None def _check_aosp_message(aosp_line): if re.search(AOSP_COMMIT_LINK_REGEX, aosp_line):