diff options
| author | Nate Damon <ndamon@moog.com> | 2019-10-24 11:06:19 -0400 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-10-26 16:56:41 +0900 |
| commit | 73b4404275c8599a656e6b3c9d08e8a9170eecbf (patch) | |
| tree | 0647494e379d3bf4659932c2983aa8992a676aec /sphinx/builders/html.py | |
| parent | 1d055900aefbf791474c468d657b86a59ec624dd (diff) | |
| download | sphinx-git-73b4404275c8599a656e6b3c9d08e8a9170eecbf.tar.gz | |
Corrected typo where drives were not compared, meaning the check always evaluates to false
Diffstat (limited to 'sphinx/builders/html.py')
| -rw-r--r-- | sphinx/builders/html.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py index 1a2f69088..4cdd8c32e 100644 --- a/sphinx/builders/html.py +++ b/sphinx/builders/html.py @@ -1162,7 +1162,7 @@ def validate_html_extra_path(app: Sphinx, config: Config) -> None: if not path.exists(extra_path): logger.warning(__('html_extra_path entry %r does not exist'), entry) config.html_extra_path.remove(entry) - elif (path.splitdrive(app.outdir)[0] == path.splitdrive(extra_path) and + elif (path.splitdrive(app.outdir)[0] == path.splitdrive(extra_path)[0] and path.commonpath([app.outdir, extra_path]) == app.outdir): logger.warning(__('html_extra_path entry %r is placed inside outdir'), entry) config.html_extra_path.remove(entry) @@ -1175,7 +1175,7 @@ def validate_html_static_path(app: Sphinx, config: Config) -> None: if not path.exists(static_path): logger.warning(__('html_static_path entry %r does not exist'), entry) config.html_static_path.remove(entry) - elif (path.splitdrive(app.outdir)[0] == path.splitdrive(static_path) and + elif (path.splitdrive(app.outdir)[0] == path.splitdrive(static_path)[0] and path.commonpath([app.outdir, static_path]) == app.outdir): logger.warning(__('html_static_path entry %r is placed inside outdir'), entry) config.html_static_path.remove(entry) |