From 35c3a51c1755fd41e26c2698b5f4e4f279d28172 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Thu, 18 Jun 2020 12:09:51 +0800 Subject: [PATCH] docs: fix link_roles not linking correctly for certain files Link_roles could link incorrectly if the name of a file matched the name of a submodule --- docs/idf_extensions/link_roles.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/idf_extensions/link_roles.py b/docs/idf_extensions/link_roles.py index 7ed9affdc..744f6c34b 100644 --- a/docs/idf_extensions/link_roles.py +++ b/docs/idf_extensions/link_roles.py @@ -57,7 +57,8 @@ def github_link(link_type, idf_rev, submods, root_path, app_config): # Redirects to submodule repo if path is a submodule, else default to IDF repo def redirect_submodule(path, submods, rev): for key, value in submods.items(): - if path.lstrip('/').startswith(key): + # Add path separator to end of submodule path to ensure we are matching a directory + if path.lstrip('/').startswith(os.path.join(key, '')): return value.url.replace('.git', ''), value.rev, re.sub('^/{}/'.format(key), '', path) return IDF_REPO, rev, path