fixed merge conflict

1 files changed, 16 insertions, 11 deletions

diff --git a/setup.py b/setup.py
index 65adbe992..e3c45ce3e 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,23 @@ 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