aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Burgess IV <gbiv@google.com>2024-03-18 08:16:00 -0600
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2024-03-19 23:09:30 +0000
commit12edaa8d10cfc8f7588873c2ad3e95bcc27ffc71 (patch)
tree51804264ae6629aef53b40fba319497ad06b1ed1
parent23453f961a3fb7017cf5c2a83f65902b7e127e7e (diff)
downloadtoolchain-utils-12edaa8d10cfc8f7588873c2ad3e95bcc27ffc71.tar.gz
afdo_tools: fix `git` invocation in update_kernel_afdo.py
Now that I look at this code, `cc=foo,bar,r=baz` pretty obviously doesn't work. Oops. :) BUG=b:329449239 TEST=Ran on Chrotomation Change-Id: I556e6bd1a7057eed6b4a27134c147bd114aa323e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/5377047 Commit-Queue: George Burgess <gbiv@chromium.org> Reviewed-by: Jordan Abrahams-Whitehead <ajordanr@google.com> Tested-by: George Burgess <gbiv@chromium.org>
-rwxr-xr-xafdo_tools/update_kernel_afdo.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/afdo_tools/update_kernel_afdo.py b/afdo_tools/update_kernel_afdo.py
index fb0d34be..76e336e4 100755
--- a/afdo_tools/update_kernel_afdo.py
+++ b/afdo_tools/update_kernel_afdo.py
@@ -732,8 +732,9 @@ def upload_head_to_gerrit(
branch: GitBranch,
):
"""Uploads HEAD to gerrit as a CL, and sets reviewers/CCs."""
- reviewers = ",".join(CL_REVIEWERS)
- cc = ",".join(CL_CC)
+ option_list = [f"r={x}" for x in CL_REVIEWERS]
+ option_list += (f"cc={x}" for x in CL_CC)
+ options = ",".join(option_list)
run_result = subprocess.run(
[
"git",
@@ -741,7 +742,7 @@ def upload_head_to_gerrit(
branch.remote,
# https://gerrit-review.googlesource.com/Documentation/user-upload.html#reviewers
# for more info on the `%` params.
- f"HEAD:refs/for/{branch.branch_name}%r={reviewers},cc={cc}",
+ f"HEAD:refs/for/{branch.branch_name}%{options}",
],
cwd=toolchain_utils,
check=False,