Merge pull request #19697 from meeseeksmachine/auto-backport-of-pr-19690-on-v3.4.x

QuLogic · web-flow · commit 09c26485fb9d · 2021-03-13T04:52:01.000-05:00
Backport PR #19690 on branch v3.4.x (Only warn about existing redirects if content differs.)
diff --git a/doc/sphinxext/redirect_from.py b/doc/sphinxext/redirect_from.py
@@ -76,12 +76,13 @@ 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)
         if p.is_file():
-            logger.warning(f'A redirect-from directive is trying to create '
-                           f'{p}, but that file already exists (perhaps '
-                           f'you need to run "make clean")')
+            if p.read_text() != html:
+                logger.warning(f'A redirect-from directive is trying to '
+                               f'create {p}, but that file already exists '
+                               f'(perhaps you need to run "make clean")')
         else:
+            logger.info(f'making refresh html file: {k} redirect to {v}')
             p.parent.mkdir(parents=True, exist_ok=True)
-            with p.open("x") as file:
-                logger.info(f'making refresh html file: {k} redirect to {v}')
-                file.write(HTML_TEMPLATE.format(v=v))
+            p.write_text(html)
