From 9a3d84b29e33eb5249cc1c04f61bb47f8d1fc1f6 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 25 Jan 2011 11:41:49 -0800
Subject: Adds conditional around sphinx inclusion.

---
 setup.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 65adbe992..484e50e6c 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,6 @@ import subprocess
 
 from setuptools import setup, find_packages
 from setuptools.command.sdist import sdist
-from sphinx.setup_command import BuildDoc
 
 from nova.utils import parse_mailmap, str_dict_replace
 from nova import version
@@ -34,14 +33,6 @@ if os.path.isdir('.bzr'):
         version_file.write(vcsversion)
 
 
-class local_BuildDoc(BuildDoc):
-    def run(self):
-        for builder in ['html', 'man']:
-            self.builder = builder
-            self.finalize_options()
-            BuildDoc.run(self)
-
-
 class local_sdist(sdist):
     """Customized sdist hook - builds the ChangeLog file from VC first"""
 
@@ -57,9 +48,22 @@ class local_sdist(sdist):
             with open("ChangeLog", "w") as changelog_file:
                 changelog_file.write(str_dict_replace(changelog, mailmap))
         sdist.run(self)
+nova_cmdclass = {'sdist': local_sdist}
+
+
+try:
+    from sphinx.setup_command import BuildDoc
+    class local_BuildDoc(BuildDoc):
+        def run(self):
+            for builder in ['html', 'man']:
+                self.builder = builder
+                self.finalize_options()
+                BuildDoc.run(self)
+    nova_cmdclass['build_sphinx'] = local_BuildDoc
+
+except:
+    pass
 
-nova_cmdclass = {'sdist': local_sdist,
-                 'build_sphinx': local_BuildDoc}
 
 try:
     from babel.messages import frontend as babel
-- 
cgit 


From dd7008e4edc6e9be2248ff663664adb2a662e745 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 27 Jan 2011 23:53:46 -0800
Subject: Fixed a pep8 spacing issue.

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 484e50e6c..e3c45ce3e 100644
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@ nova_cmdclass = {'sdist': local_sdist}
 
 try:
     from sphinx.setup_command import BuildDoc
+
     class local_BuildDoc(BuildDoc):
         def run(self):
             for builder in ['html', 'man']:
-- 
cgit