diff options
| author | bors <bors@rust-lang.org> | 2019-02-18 08:37:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-18 08:37:18 +0000 |
| commit | 684b09ba7f7b2e163a198fd843128e7260e24e6c (patch) | |
| tree | 1e9a3d06c09208c315a6a37f8db8a7388e3cb75a | |
| parent | d215d9591f27d0663445e65615090621153c31df (diff) | |
| parent | 66ae3131fc16c76fbad4309a39b3300114dc8141 (diff) | |
Auto merge of #58541 - kennytm:fix-publish-toolstate-py-again, r=oli-obk
publish_toolstate.py: further fix the runtime errors The regex was missing a `,`, causing `relevant_pr_match` to become None and set the PR number to -1 and assigned the new issue to `@<unknown user>`. This causes the 422 error when creating the issue due to invalid assignee and unable to leave the tool-is-broken comment since PR -1 does not exist. The default user names are now also changed to @ghost to prevent the 422 error in case anything goes wrong again.
| -rwxr-xr-x | src/tools/publish_toolstate.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/publish_toolstate.py b/src/tools/publish_toolstate.py index ef17d6fbd5d..abcf14d90be 100755 --- a/src/tools/publish_toolstate.py +++ b/src/tools/publish_toolstate.py @@ -171,7 +171,7 @@ if __name__ == '__main__': # assume that PR authors are also owners of the repo where the branch lives relevant_pr_match = re.search( - 'Auto merge of #([0-9]+) - ([^:]+):[^,]+ r=([^\s]+)', + r'Auto merge of #([0-9]+) - ([^:]+):[^,]+, r=(\S+)', cur_commit_msg, ) if relevant_pr_match: @@ -182,10 +182,10 @@ if __name__ == '__main__': pr_reviewer = relevant_pr_match.group(3) else: number = '-1' - relevant_pr_user = '<unknown user>' + relevant_pr_user = 'ghost' relevant_pr_number = '<unknown PR>' relevant_pr_url = '<unknown>' - pr_reviewer = '<unknown reviewer>' + pr_reviewer = 'ghost' message = update_latest( cur_commit, |
