This is an automated email from the ASF dual-hosted git repository.
yao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new be448f2cf196 [MINOR][BUILD][FOLLOWUP] Fix merge_spark_pr script for no
jira case
be448f2cf196 is described below
commit be448f2cf196dd821d624294099487cbd1015e18
Author: Kent Yao <y...@apache.org>
AuthorDate: Fri Mar 28 18:37:29 2025 +0800
[MINOR][BUILD][FOLLOWUP] Fix merge_spark_pr script for no jira case
### What changes were proposed in this pull request?
This PR is a followup for #50237 to fix the case of `if not JIRA_IMPORTED:`
### Why are the changes needed?
fix merge tool
### Does this PR introduce _any_ user-facing change?
no, committer member only
### How was this patch tested?
merged https://github.com/apache/spark/pull/50443 w/o jira installed
### Was this patch authored or co-authored using generative AI tooling?
no
Closes #50447 from yaooqinn/jira.
Authored-by: Kent Yao <y...@apache.org>
Signed-off-by: Kent Yao <y...@apache.org>
---
dev/merge_spark_pr.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 8b0f8b56ce19..e9e82b010032 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -566,6 +566,7 @@ def get_current_ref():
def initialize_jira():
global asf_jira
+ asf_jira = None
jira_server = {"server": JIRA_API_BASE}
if not JIRA_IMPORTED:
@@ -595,7 +596,6 @@ def initialize_jira():
else:
print("Neither JIRA_ACCESS_TOKEN nor JIRA_USERNAME/JIRA_PASSWORD are
set.")
continue_maybe("Continue without jira?")
- asf_jira = None
def main():
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
