Skip to content

Commit 9fc84c7

Browse files
committed
[MINOR][BUILD] Fix merge_spark_pr script for no jira case
### What changes were proposed in this pull request? This patch tries to fix the merge script `merge_spark_pr` for no jira case by defining the `asf_jira` variable in the script. ### Why are the changes needed? When I just tried to merge one minor PR which doesn't have jira, I didn't have jira settings and got the following error: ``` Continue without jira? (y/N): y git rev-parse --abbrev-ref HEAD Which pull request would you like to merge? (e.g. 34): ... Restoring head pointer to master git checkout master Already on 'master' git branch Traceback (most recent call last): File "/.../dev/merge_spark_pr.py", line 737, in <module> main() File "/.../dev/merge_spark_pr.py", line 696, in main if asf_jira is not None: NameError: name 'asf_jira' is not defined ``` For the non jira case, `asf_jira` should be defined to avoid the error. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Locally tested. ### Was this patch authored or co-authored using generative AI tooling? No Closes #50237 from viirya/fix_merge_script. Authored-by: Liang-Chi Hsieh <viirya@gmail.com> Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com>
1 parent 9ad4a6e commit 9fc84c7

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

dev/merge_spark_pr.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@ def initialize_jira():
595595
else:
596596
print("Neither JIRA_ACCESS_TOKEN nor JIRA_USERNAME/JIRA_PASSWORD are set.")
597597
continue_maybe("Continue without jira?")
598+
asf_jira = None
598599

599600

600601
def main():

0 commit comments

Comments
 (0)