Opensource check last NO_JIRA

Author: layfield-ccdc

main/githooks.py

@@ -840,9 +840,6 @@ def check_commit_msg(message, files, repo):
     does not contain required marker.
 
     '''
-    if re.match(r'^ccdc-opensource', repo):
-        # Do not check for JIRA in opensource repo as we don't want to require external contributors to do this
-        return 0
     if re.match(r'^Merge ((remote-tracking )?branch|commit) \'.+?\'( of [^\s]+)? into .+', message):
         # Not checking for JIRA or large file in commit message generated by github
         return 0
@@ -851,6 +848,10 @@ def check_commit_msg(message, files, repo):
         # Not checking for JIRA or large file in commit message generated by github
         return 0
 
+    if re.match(r'^ccdc-opensource', repo):
+        # Do not check for JIRA in opensource repo as we don't want to require external contributors to do this
+        return 0
+
     if NO_JIRA_MARKER not in message:
         if jira_id_pattern.search(message) is None:
             _fail('Every commit should contain a Jira issue ID or the text '
@@ -938,7 +939,7 @@ def commit_hook(merge=False):
 def commit_msg_hook():
     retval = 0
     files = get_commit_files()
-    commit_message = Path(sys.argv[1]).read_text()
+    commit_message = Path(""" sys """.argv[1]).read_text()
 
     print(' Check commit message ...')
     retval += check_commit_msg(commit_message, files['M'] + files['A'], get_repo())