Skip to content
Snippets Groups Projects
Commit b82e960c authored by Mathieu Courtois's avatar Mathieu Courtois
Browse files

[#28192] Adapt DEBUT/POURSUITE checking for asterxx branch.

--HG--
branch : edf/mc
parent 139d44a3
No related branches found
No related tags found
No related merge requests found
......@@ -111,13 +111,13 @@ class InvalidFilenameXX(FilenameCat, TextMsgNotFound):
# - mac3c needs the '3'
# accept aaaaNNNm + a suffix starting with '_'
# accept 'xx*'
_expr1 = re.compile(r"/(?P<root>[a-z3]{3,5}[0-9]{2,3}[a-z]{1})"
_expr1 = re.compile(r"/(?P<root>[a-z3]{3,16}[0-9]{2,3}[a-z]{1})"
r"(?P<ext>\.(" + "|".join(REG_EXT) + "))$")
_expr2 = re.compile(r"/(?P<root>[a-z3]{3,5}[0-9]{2,3}[a-z]{1}"
_expr2 = re.compile(r"/(?P<root>[a-z3]{3,16}[0-9]{2,3}[a-z]{1}"
r"_\w{1,16})"
r"(?P<ext>\.(comm|py))$")
_expr3 = re.compile(r"/(?P<root>xx\w+)"
r"(?P<ext>(|\.(export|py)))$")
r"(?P<ext>(|\.(" + "|".join(REG_EXT) + ")))$")
_expr4 = re.compile(r"/(?P<root>[0-9]+)"
r"(?P<ext>\.med)$")
found = (_expr1.findall(txt) or
......@@ -547,6 +547,8 @@ class RequiredKeyword(FileContentCat, GenericMsg):
elif self._pours.search(txt):
if not self._poucod.search(txt):
err.append(": %s not found in POURSUITE" % self._pouerr)
elif "asterxx" in self.ctxt.branch:
pass
else:
err.append(": neither DEBUT or POURSUITE found")
return err
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment