summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2014-11-25 10:20:10 +0900
committershimizukawa <shimizukawa@gmail.com>2014-11-25 10:20:10 +0900
commit61b871014f5e88e75b5e19fef7de36c63c5666c7 (patch)
treef99cd768455b1968514ede6e3f92bb7110f3b90b
parent48d8e201e4b548f2d23663652c49907ac3892619 (diff)
downloadsphinx-61b871014f5e88e75b5e19fef7de36c63c5666c7.tar.gz
Fix: rebuilding cause crash unexpectedly when source files were added. The problem appeared at fffbcba0b.
-rw-r--r--CHANGES1
-rw-r--r--sphinx/builders/__init__.py1
-rw-r--r--sphinx/environment.py2
3 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 07b4c314..43da376a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@ Bugs fixed
* PR#311: sphinx-quickstart does not work on python 3.4.
* Fix :confval:`autodoc_docstring_signature` not working with signatures
in class docstrings.
+* Rebuilding cause crash unexpectedly when source files were added.
Release 1.3b1 (released Oct 10, 2014)
diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py
index 64ae2a09..70ec6cb5 100644
--- a/sphinx/builders/__init__.py
+++ b/sphinx/builders/__init__.py
@@ -244,7 +244,6 @@ class Builder(object):
if summary:
self.info(bold('building [%s]' % self.name) + ': ' + summary)
- updated_docnames = set()
# while reading, collect all warnings from docutils
warnings = []
self.env.set_warnfunc(lambda *args: warnings.append(args))
diff --git a/sphinx/environment.py b/sphinx/environment.py
index c3d67d73..42327354 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -590,7 +590,7 @@ class BuildEnvironment:
self.app = None
app.emit('env-updated', self)
- return docnames
+ return set(docnames)
def _read_serial(self, docnames, app):
for docname in app.status_iterator(docnames, 'reading sources... ',