summaryrefslogtreecommitdiff
path: root/sphinx/jinja2glue.py
diff options
context:
space:
mode:
authorTakayuki Shimizukawa <shimizukawa@gmail.com>2013-10-12 17:01:55 +0900
committerTakayuki Shimizukawa <shimizukawa@gmail.com>2013-10-12 17:01:55 +0900
commitb6480b164d47252869f860c4dbda9ef4ada299ed (patch)
treecef07651feacaf67d04b2d8f2b558983e02c7439 /sphinx/jinja2glue.py
parent5287dc6c619e0d757bdaeebfeaffa6dc553f3629 (diff)
downloadsphinx-git-b6480b164d47252869f860c4dbda9ef4ada299ed.tar.gz
Fix: `html_theme_path=['.']` is a trigger of rebuild all documents always.
Diffstat (limited to 'sphinx/jinja2glue.py')
-rw-r--r--sphinx/jinja2glue.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/sphinx/jinja2glue.py b/sphinx/jinja2glue.py
index 20d92a32d..47b4bcc7d 100644
--- a/sphinx/jinja2glue.py
+++ b/sphinx/jinja2glue.py
@@ -91,25 +91,25 @@ class BuiltinTemplateLoader(TemplateBridge, BaseLoader):
# create a chain of paths to search
if theme:
# the theme's own dir and its bases' dirs
- chain = theme.get_dirchain()
+ pathchain = theme.get_dirchain()
# then the theme parent paths
- chain.extend(theme.themepath)
+ loaderchain = pathchain + theme.themepath
elif dirs:
- chain = list(dirs)
+ pathchain = loaderchain = list(dirs)
else:
- chain = []
+ pathchain = loaderchain = []
# prepend explicit template paths
self.templatepathlen = len(builder.config.templates_path)
if builder.config.templates_path:
- chain[0:0] = [path.join(builder.confdir, tp)
- for tp in builder.config.templates_path]
+ pathchain[0:0] = [path.join(builder.confdir, tp)
+ for tp in builder.config.templates_path]
# store it for use in newest_template_mtime
- self.pathchain = chain
+ self.pathchain = pathchain
# make the paths into loaders
- self.loaders = map(SphinxFileSystemLoader, chain)
+ self.loaders = map(SphinxFileSystemLoader, loaderchain)
use_i18n = builder.app.translator is not None
extensions = use_i18n and ['jinja2.ext.i18n'] or []