Merge pull request #6501 from tk0miya/6499_html_logo_never_updated

Fix #6499: html: Sphinx never updates a copy of html_logo

1 files changed, 4 insertions, 10 deletions

diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index c8d330d2d..147ac14a9 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -787,17 +787,11 @@ class StandaloneHTMLBuilder(Builder):
                            context=ctx, renderer=self.templates)
             # copy logo and favicon files if not already in static path
             if self.config.html_logo:
-                logobase = path.basename(self.config.html_logo)
-                logotarget = path.join(self.outdir, '_static', logobase)
-                if not path.isfile(logotarget):
-                    copyfile(path.join(self.confdir, self.config.html_logo),
-                             logotarget)
+                entry = path.join(self.confdir, self.config.html_logo)
+                copy_asset(entry, path.join(self.outdir, '_static'))
             if self.config.html_favicon:
-                iconbase = path.basename(self.config.html_favicon)
-                icontarget = path.join(self.outdir, '_static', iconbase)
-                if not path.isfile(icontarget):
-                    copyfile(path.join(self.confdir, self.config.html_favicon),
-                             icontarget)
+                entry = path.join(self.confdir, self.config.html_favicon)
+                copy_asset(entry, path.join(self.outdir, '_static'))
             logger.info(__('done'))
         except OSError as err:
             logger.warning(__('cannot copy static file %r'), err)