Browse Source

HADOOP-18251. Fix failure of extracting JIRA id from commit message in git_jira_fix_version_check.py. (#4344)

Masatake Iwasaki 2 years ago
parent
commit
6b331dde31
1 changed files with 3 additions and 4 deletions
  1. 3 4
      dev-support/git-jira-validation/git_jira_fix_version_check.py

+ 3 - 4
dev-support/git-jira-validation/git_jira_fix_version_check.py

@@ -71,10 +71,9 @@ for commit in subprocess.check_output(['git', 'log', '--pretty=oneline']).decode
         print("Commit seems reverted. \t\t\t Commit: " + commit)
         continue
     ACTUAL_PROJECT_JIRA = None
-    for project_jira in project_jira_keys:
-        if project_jira in commit:
-            ACTUAL_PROJECT_JIRA = project_jira
-            break
+    matches = re.findall('|'.join(project_jira_keys), commit)
+    if matches:
+        ACTUAL_PROJECT_JIRA = matches[0]
     if not ACTUAL_PROJECT_JIRA:
         print("WARN: Jira not found. \t\t\t Commit: " + commit)
         continue