Skip to content

Commit

Permalink
[MINOR][INFRA] Make "y/n" consistent within merge script
Browse files Browse the repository at this point in the history
### What changes were proposed in this pull request?

This PR changes the y/n message and condition consistent within merging script.

### Why are the changes needed?

For consistency.

```
Would you like to use the modified body? (y/N): y
...
Proceed with merging pull request apache#45426? (y/N): y
...
Merge complete (local ref PR_TOOL_MERGE_PR_45426_MASTER). Push to apache? (y/N): y
...
Would you like to pick 9cac2bb into another branch? (y/N): n
...
Would you like to update an associated JIRA? (y/N): y
...
Check if the JIRA information is as expected (Y/n): y  # <-- Inconsistent.
```

### Does this PR introduce _any_ user-facing change?

No, dev-only.

### How was this patch tested?

Manually tested.

### Was this patch authored or co-authored using generative AI tooling?

No.

Closes apache#45427 from HyukjinKwon/minor-script.

Authored-by: Hyukjin Kwon <gurwls223@apache.org>
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
  • Loading branch information
HyukjinKwon authored and sweisdb committed Apr 1, 2024
1 parent 2577ef8 commit 75c95a9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion dev/merge_spark_pr.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def get_jira_issue(prompt, default_jira_id=""):
if status == "Resolved" or status == "Closed":
print("JIRA issue %s already has status '%s'" % (jira_id, status))
return None
if bold_input("Check if the JIRA information is as expected (Y/n): ").lower() != "n":
if bold_input("Check if the JIRA information is as expected (y/N): ").lower() == "y":
return issue
else:
return get_jira_issue("Enter the revised JIRA ID again or leave blank to skip")
Expand Down

0 comments on commit 75c95a9

Please sign in to comment.