Merge pull request #81148 from aireilly/dont-catch-commented-includes

aireilly · web-flow · commit fe6f6f0b2122 · 2024-12-06T11:49:05.000Z
Don't catch commented includes in the build_for_portal script
diff --git a/build_for_portal.py b/build_for_portal.py
@@ -37,7 +37,7 @@
 EXTERNAL_LINK_RE = re.compile(
     "[\./]*([\w_-]+)/[\w_/-]*?([\w_.-]*\.(?:html|adoc))", re.DOTALL
 )
-INCLUDE_RE = re.compile("include::(.*?)\[(.*?)\]", re.M)
+INCLUDE_RE = re.compile(r"^include::(.*?)\[(.*?)\]", re.M)
 IFDEF_RE = re.compile(r"^if(n?)def::(.*?)\[\]", re.M)
 ENDIF_RE = re.compile(r"^endif::(.*?)\[\]\r?\n", re.M)
 COMMENT_CONTENT_RE = re.compile(r"^^////$.*?^////$", re.M | re.DOTALL)

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`EXTERNAL_LINK_RE = re.compile(`
`38`	`38`	`"[\./]([\w_-]+)/[\w_/-]?([\w_.-]*\.(?:html\|adoc))", re.DOTALL`
`39`	`39`	`)`
`40`		`-INCLUDE_RE = re.compile("include::(.?)\[(.?)\]", re.M)`
	`40`	`+INCLUDE_RE = re.compile(r"^include::(.?)\[(.?)\]", re.M)`
`41`	`41`	`IFDEF_RE = re.compile(r"^if(n?)def::(.*?)\[\]", re.M)`
`42`	`42`	`ENDIF_RE = re.compile(r"^endif::(.*?)\[\]\r?\n", re.M)`
`43`	`43`	`COMMENT_CONTENT_RE = re.compile(r"^^////$.*?^////$", re.M \| re.DOTALL)`