Revert "Remove sphinx_config.init_values() manual call"

This caused in issue in the gate for tox -edocs builds:

   http://logs.openstack.org/15/187715/5/check/gate-infra-specs-docs/a8cae26/console.html

This reverts commit 1dfe9ef348.

Change-Id: Ia6cfbfe5b10a5b714fbb9f21ca61380aaf231638
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2015-06-09 14:34:04 -04:00
parent dceb9e56dd
commit e41a9180ed
1 changed files with 5 additions and 4 deletions

View File

@ -27,6 +27,7 @@ except ImportError:
try:
from sphinx import apidoc
from sphinx import application
from sphinx import config
from sphinx import setup_command
except Exception as e:
# NOTE(dhellmann): During the installation of docutils, setuptools
@ -128,16 +129,16 @@ class LocalBuildDoc(setup_command.BuildDoc):
confoverrides['release'] = self.release
if self.today:
confoverrides['today'] = self.today
sphinx_config = config.Config(self.config_dir, 'conf.py', {}, [])
sphinx_config.init_values()
if self.builder == 'man' and len(sphinx_config.man_pages) == 0:
return
app = application.Sphinx(
self.source_dir, self.config_dir,
self.builder_target_dir, self.doctree_dir,
self.builder, confoverrides, status_stream,
freshenv=self.fresh_env, warningiserror=True)
if self.builder == 'man' and len(app.config.man_pages) == 0:
return
try:
app.build(force_all=self.all_files)
except Exception as err: