commit bcbd28920948fd14923e46867069e9632b9e7455
author Brian Hulette <hulettbh@gmail.com> Fri Jan 24 15:07:29 2020 -0500
committer François Saint-Jacques <fsaintjacques@gmail.com> Fri Jan 24 15:07:29 2020 -0500
tree a463fbbf6b8c88e84a420a7683eb5764e724b3a8
parent 99f247f5c86fa399c74b06e370863e9a2c1f66c0

ARROW-7674: [Dev] Add helpful message for captcha challenge in merge_arrow_pr.py

Closes #6277 from TheNeuralBit/merge-captcha and squashes the following commits:

1134791de <François Saint-Jacques> Fix python linter
1c844e45a <Brian Hulette> Add helpful message for captcha challenge

Lead-authored-by: Brian Hulette <hulettbh@gmail.com>
Co-authored-by: François Saint-Jacques <fsaintjacques@gmail.com>
Signed-off-by: François Saint-Jacques <fsaintjacques@gmail.com>

dev/merge_arrow_pr.py

diff --git a/dev/merge_arrow_pr.py b/dev/merge_arrow_pr.py
index 7373f3a..ecbda09 100755
--- a/dev/merge_arrow_pr.py
+++ b/dev/merge_arrow_pr.py
@@ -47,6 +47,7 @@
 
 try:
     import jira.client
+    import jira.exceptions
 except ImportError:
     print("Could not find jira library. "
           "Run 'sudo pip install jira' to install.")
@@ -516,8 +517,20 @@
 
 
 def connect_jira(cmd):
-    return jira.client.JIRA({'server': JIRA_API_BASE},
-                            basic_auth=get_credentials(cmd))
+    try:
+        return jira.client.JIRA({'server': JIRA_API_BASE},
+                                basic_auth=get_credentials(cmd))
+    except jira.exceptions.JIRAError as e:
+        if "CAPTCHA_CHALLENGE" in e.text:
+            print("")
+            print("It looks like you need to answer a captcha challenge for "
+                  "this account (probably due to a login attempt with an "
+                  "incorrect password). Please log in at "
+                  "https://issues.apache.org/jira and complete the captcha "
+                  "before running this tool again.")
+            print("Exiting.")
+            sys.exit(1)
+        raise e
 
 
 def get_pr_num():