summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sphinx/quickstart.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index a4d983235..d09ef7c55 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -438,7 +438,10 @@ def generate(d, overwrite=True, silent=False, templatedir=None):
else:
print('File %s already exists, skipping.' % fpath)
- with open(os.path.join(package_dir, 'templates', 'quickstart', 'conf.py_t')) as f:
+ conf_path = os.path.join(templatedir, 'conf.py_t') if templatedir else None
+ if not conf_path or not path.isfile(conf_path):
+ conf_path = os.path.join(package_dir, 'templates', 'quickstart', 'conf.py_t')
+ with open(conf_path) as f:
conf_text = convert_python_source(f.read())
write_file(path.join(srcdir, 'conf.py'), template.render_string(conf_text, d))