From a727713232963913b9a839d24a53416dc73db5f6 Mon Sep 17 00:00:00 2001 From: Yuriy Andamasov Date: Tue, 12 May 2026 09:05:22 +0300 Subject: T8843: Fix conflict markers committed by Mergify backport of #1994 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The auto-backport PR #1999 committed literal git conflict markers into docs/conf.py because _copy_md_sources sits before _write_llms_txt on circinus but after it on rolling — cherry-pick failed to locate the patch context and dropped the entire new function as a duplicate with markers. Removes the conflict-marker block and applies the actual 3-line guard to the existing _copy_md_sources function. Build was failing with "SyntaxError: invalid syntax (conf.py, line 309)". 🤖 Generated by [robots](https://vyos.io) --- docs/conf.py | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'docs') diff --git a/docs/conf.py b/docs/conf.py index d3c6cc45..60d00a95 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -250,6 +250,9 @@ def _copy_md_sources(app, exception): src = pathlib.Path(app.srcdir) out = pathlib.Path(app.outdir) for path in src.rglob("*.md"): + # Skip files in excluded directories to prevent recursive nesting + if any(part in {'_build', '_rst_legacy'} for part in path.parts): + continue dest = out / path.relative_to(src) dest.parent.mkdir(parents=True, exist_ok=True) shutil.copy2(path, dest) @@ -306,24 +309,6 @@ def _write_llms_txt(app, exception): out_path.write_text(rendered, encoding='utf-8') -<<<<<<< HEAD -======= -def _copy_md_sources(app, exception): - """Copy .md source files verbatim into the HTML output tree.""" - if exception is not None: - return - src = pathlib.Path(app.srcdir) - out = pathlib.Path(app.outdir) - for path in src.rglob("*.md"): - # Skip files in excluded directories to prevent recursive nesting - if any(part in {'_build', '_rst_legacy'} for part in path.parts): - continue - dest = out / path.relative_to(src) - dest.parent.mkdir(parents=True, exist_ok=True) - shutil.copy2(path, dest) - - ->>>>>>> ec6f33f3 (Fix recursive _build directory nesting error) def setup(app): app.connect('builder-inited', _prefer_webp) app.connect('build-finished', _copy_md_sources) -- cgit v1.2.3