diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2014-01-22 18:34:51 +0400 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2014-01-22 18:34:51 +0400 |
| commit | fbc580716c7f453291eb1d9dcf22e6586e828837 (patch) | |
| tree | 26bce4c2ef75b4ebe8422685d8962aa07978bad2 /sphinx/builders | |
| parent | 9cd3b4aea7a5d7e6cf776646faba12b4cfa1c2a9 (diff) | |
| parent | 930d996dbe5bcccbb0d86de5940376b70ed7c3db (diff) | |
| download | sphinx-fbc580716c7f453291eb1d9dcf22e6586e828837.tar.gz | |
Merge
Diffstat (limited to 'sphinx/builders')
| -rw-r--r-- | sphinx/builders/html.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py index b5ca56bd..5b1a7594 100644 --- a/sphinx/builders/html.py +++ b/sphinx/builders/html.py @@ -590,15 +590,17 @@ class StandaloneHTMLBuilder(Builder): if self.config.html_logo: logobase = path.basename(self.config.html_logo) logotarget = path.join(self.outdir, '_static', logobase) - if not path.isfile(logobase): - self.warn('logo file %r does not exist' % logobase) + if not path.isfile(path.join(self.confdir, self.config.html_logo)): + self.warn('logo file %r does not exist' % self.config.html_logo) elif not path.isfile(logotarget): copyfile(path.join(self.confdir, self.config.html_logo), logotarget) if self.config.html_favicon: iconbase = path.basename(self.config.html_favicon) icontarget = path.join(self.outdir, '_static', iconbase) - if not path.isfile(icontarget): + if not path.isfile(path.join(self.confdir, self.config.html_favicon)): + self.warn('favicon file %r does not exist' % self.config.html_favicon) + elif not path.isfile(icontarget): copyfile(path.join(self.confdir, self.config.html_favicon), icontarget) self.info('done') |