diff options
author | Josip Sokcevic <sokcevic@chromium.org> | 2024-10-31 21:10:39 +0000 |
---|---|---|
committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-10-31 21:18:53 +0000 |
commit | aada468916936d034a9ac0f0c1e5ebeebd7f3e87 (patch) | |
tree | 8efe7a3fe3af64ccc96fa25ac8a32fdafb0bcffd | |
parent | 1d5098617ec7f476b76d1aa676e2a001d2c3d533 (diff) | |
download | git-repo-aada468916936d034a9ac0f0c1e5ebeebd7f3e87.tar.gz |
upload: Return correct tuple values in _ProcessResultsv2.49.2
Incorrect tuple values were returned with http://go/grev/440221 -
instead of returning (Project, ReviewableBranch), _ProcessResults was
returning (int, ReviewableBranch).
R=jojwang@google.com
Bug: 376731172
Change-Id: I75205f42fd23f5ee6bd8d0c15b18066189b42bd9
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/441121
Reviewed-by: Sam Saccone <samccone@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Tested-by: Josip Sokcevic <sokcevic@google.com>
-rw-r--r-- | subcmds/upload.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subcmds/upload.py b/subcmds/upload.py index 9b77b0ee..bac2f8ac 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py | |||
@@ -737,8 +737,8 @@ Gerrit Code Review: https://www.gerritcodereview.com/ | |||
737 | pending = [] | 737 | pending = [] |
738 | for result in results: | 738 | for result in results: |
739 | project_idx, avail = result | 739 | project_idx, avail = result |
740 | project = projects[project_idx] | ||
740 | if avail is None: | 741 | if avail is None: |
741 | project = projects[project_idx] | ||
742 | logger.error( | 742 | logger.error( |
743 | 'repo: error: %s: Unable to upload branch "%s". ' | 743 | 'repo: error: %s: Unable to upload branch "%s". ' |
744 | "You might be able to fix the branch by running:\n" | 744 | "You might be able to fix the branch by running:\n" |
@@ -748,7 +748,7 @@ Gerrit Code Review: https://www.gerritcodereview.com/ | |||
748 | project.manifest.branch, | 748 | project.manifest.branch, |
749 | ) | 749 | ) |
750 | elif avail: | 750 | elif avail: |
751 | pending.append(result) | 751 | pending.append((project, avail)) |
752 | return pending | 752 | return pending |
753 | 753 | ||
754 | with self.ParallelContext(): | 754 | with self.ParallelContext(): |