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

#338: Fix running with `-C` under Windows.

Browse Source
This commit is contained in:
Georg Brandl 2010-02-23 21:35:48 +01:00
parent ef8ae809e6
commit b24e6d55e3
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
Release 0.6.5 (in development)
==============================
* #338: Fix running with ``-C`` under Windows.
* Make the ``start-after`` and ``end-before`` options to the
``literalinclude`` directive work correctly if not used together.

5
sphinx/application.py
View File

@ -94,6 +94,11 @@ class Sphinx(object):
self.config = Config(confdir, CONFIG_FILENAME, confoverrides, self.tags)
self.config.check_unicode(self.warn)
# set confdir to srcdir if -C given (!= no confdir); a few pieces
# of code expect a confdir to be set
if self.confdir is None:
self.confdir = self.srcdir
# load all extension modules
for extension in self.config.extensions:
self.setup_extension(extension)