IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3399 from pashango2/stable

Browse Source 
Fixed bug that conf.py was not overwritten by template
This commit is contained in:
Takeshi KOMIYA 2017-02-07 11:32:11 +09:00 committed by GitHub
commit a403c83e51
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/quickstart.py
View File

@ -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))