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

Apply config overrides before searching for version info.

Browse Source
This commit is contained in:
Georg Brandl 2007-08-06 16:54:17 +00:00
parent 8ea4b866d8
commit 9fe28bd780
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sphinx/builder.py
View File

@ -97,6 +97,8 @@ class Builder(object):
for key, val in self.config.items():
if isinstance(val, types.ModuleType):
del self.config[key]
if confoverrides:
self.config.update(confoverrides)
# replace version info if 'auto'
if self.config['version'] == 'auto' or self.config['revision'] == 'auto':
try:
@ -109,8 +111,6 @@ class Builder(object):
self.config['version'] = version
if self.config['release'] == 'auto':
self.config['release'] = release
if confoverrides:
self.config.update(confoverrides)
self.status_stream = status_stream or sys.stdout
self.warning_stream = warning_stream or sys.stderr