[pytango] 124/483: added warning if sphinx is not installed

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 0bce82d7ed3697e35dd39ef63efc192d4c985253
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Mon Jun 18 13:27:25 2012 +0000

    added warning if sphinx is not installed
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@20710 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 0300fa5..16035a1 100644
--- a/setup.py
+++ b/setup.py
@@ -39,8 +39,7 @@ try:
     import sphinx.util.console
     sphinx.util.console.color_terminal = lambda : False
     from sphinx.setup_command import BuildDoc
-except Exception,e:
-    print e
+except ImportError:
     sphinx = None
 
 try:
@@ -150,10 +149,11 @@ class build(dftbuild):
         if self.no_doc:
             return False
         if sphinx is None:
+            self.warn("Documentation will not be generated: sphinx is not available")
             return False
         v = map(int, sphinx.__version__.split("."))
         if v <= [0,6,5]:
-            print "Documentation will not be generated: sphinx version (%s) too low. Needs 0.6.6" % sphinx.__version__
+            self.warn("Documentation will not be generated: sphinx version (%s) too low. Needs 0.6.6" % sphinx.__version__)
             return False 
         setup_dir = os.path.dirname(os.path.abspath(__file__))
         return os.path.isdir(os.path.join(setup_dir, 'doc'))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git