From: Shane Carr <shane@unicode.org>
Date: Wed, 9 Mar 2022 19:07:20 +0000 (-0800)
Subject: ICU-21900 Fix issue filtering in commit checker
X-Git-Tag: release-71-rc~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a5f045992eab8898eff5f6628650e75b8f13bc3;p=icu

ICU-21900 Fix issue filtering in commit checker
---

diff --git a/tools/commit-checker/check.py b/tools/commit-checker/check.py
index eb2392e1a2e..643ede3da09 100644
--- a/tools/commit-checker/check.py
+++ b/tools/commit-checker/check.py
@@ -78,14 +78,14 @@ def make_commit_wanted(jira_issue):
         commit_wanted = CommitWanted["FORBIDDEN"]
     elif jira_issue.fields.resolution.id in [ R_FIXED_NON_REPO, R_FIX_SURVEY_TOOL, R_FIXED_BY_OTHER_TICKET ]:
         commit_wanted = CommitWanted["FORBIDDEN"]
+    elif jira_issue.fields.issuetype.id in [ I_ICU_USERGUIDE, I_TASK ]:
+        commit_wanted = CommitWanted["OPTIONAL"]
     elif jira_issue.fields.resolution.id in [ R_FIXED ]:
         commit_wanted = CommitWanted["REQUIRED"]
     elif jira_issue.fields.resolution.id == R_FIXED_BY_OTHER_TICKET:
         commit_wanted = CommitWanted["FORBIDDEN"]
     elif jira_issue.fields.resolution.id != R_FIXED:
         commit_wanted = CommitWanted["ERROR"]
-    elif jira_issue.fields.issuetype.id in [ I_ICU_USERGUIDE, I_TASK ]:
-        commit_wanted = CommitWanted["OPTIONAL"]
     else:
         commit_wanted = CommitWanted["REQUIRED"]
     return commit_wanted