Merge pull request #19793 from jklymak/fix-non-existent-URIs

timhoffm · web-flow · commit e6fd9012d823 · 2021-03-28T23:56:14.000+02:00
Fix non existent URI s
diff --git a/doc/sphinxext/redirect_from.py b/doc/sphinxext/redirect_from.py
@@ -65,8 +65,7 @@ def run(self):
             raise ValueError(
                 f"{redirected_reldoc} is already noted as redirecting to "
                 f"{self.redirects[redirected_reldoc]}")
-        self.redirects[redirected_reldoc] = builder.get_relative_uri(
-            redirected_reldoc, current_doc)
+        self.redirects[redirected_reldoc] = current_doc
         return []
 
 
@@ -76,7 +75,7 @@ def _generate_redirects(app, exception):
         return
     for k, v in RedirectFrom.redirects.items():
         p = Path(app.outdir, k + builder.out_suffix)
-        html = HTML_TEMPLATE.format(v=v)
+        html = HTML_TEMPLATE.format(v=builder.get_relative_uri(k, v))
         if p.is_file():
             if p.read_text() != html:
                 logger.warning(f'A redirect-from directive is trying to '
