From e87c2680e505153beb6724347356293c5250a029 Mon Sep 17 00:00:00 2001 From: hyukjinkwon Date: Thu, 26 Jul 2018 16:24:03 +0800 Subject: [PATCH 1/3] Make merge script don't swallow KeyboardInterrupt --- dev/merge_spark_pr.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index 79c7c021fe74a..ac7b4a4939a6d 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -319,7 +319,7 @@ def choose_jira_assignee(issue, asf_jira): annotations.append("Commentor") print("[%d] %s (%s)" % (idx, author.displayName, ",".join(annotations))) raw_assignee = input( - "Enter number of user, or userid, to assign to (blank to leave unassigned):") + "Enter number of user, or userid to assign to (blank to leave unassigned):") if raw_assignee == "": return None else: @@ -331,6 +331,9 @@ def choose_jira_assignee(issue, asf_jira): assignee = asf_jira.user(raw_assignee) asf_jira.assign_issue(issue.key, assignee.key) return assignee + except KeyboardInterrupt: + traceback.print_exc() + sys.exit(-1) except: traceback.print_exc() print("Error assigning JIRA, try again (or leave blank and fix manually)") From ef2303d444fb60c316ed8f971fc086917be39124 Mon Sep 17 00:00:00 2001 From: hyukjinkwon Date: Thu, 26 Jul 2018 16:40:43 +0800 Subject: [PATCH 2/3] Just keep comma --- 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 ac7b4a4939a6d..1b941327aba74 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -319,7 +319,7 @@ def choose_jira_assignee(issue, asf_jira): annotations.append("Commentor") print("[%d] %s (%s)" % (idx, author.displayName, ",".join(annotations))) raw_assignee = input( - "Enter number of user, or userid to assign to (blank to leave unassigned):") + "Enter number of user, or userid, to assign to (blank to leave unassigned):") if raw_assignee == "": return None else: From 8b6ea009dbd8c7ac6ecef601b6e6734725b11815 Mon Sep 17 00:00:00 2001 From: hyukjinkwon Date: Thu, 26 Jul 2018 22:18:49 +0800 Subject: [PATCH 3/3] Address comments --- dev/merge_spark_pr.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index 1b941327aba74..fd3eeb007a845 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -332,8 +332,7 @@ def choose_jira_assignee(issue, asf_jira): asf_jira.assign_issue(issue.key, assignee.key) return assignee except KeyboardInterrupt: - traceback.print_exc() - sys.exit(-1) + raise except: traceback.print_exc() print("Error assigning JIRA, try again (or leave blank and fix manually)")