[pytango] 11/483: fixes #3284435; fixes #3284440 (I hope)

[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 78dddfde7b8d55a25b5343f84cc9d07142b7a00c
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Tue Apr 12 08:05:03 2011 +0000

    fixes #3284435; fixes #3284440 (I hope)
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@16504 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 doc/revision.rst | 1 +
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/revision.rst b/doc/revision.rst
index 4fd4599..8d6ea81 100644
--- a/doc/revision.rst
+++ b/doc/revision.rst
@@ -73,6 +73,7 @@ Version history
 |            |         - 3284265: [pytango][7.1.4] a few files without licence and copyright       |
 |            |         - 3284318: copyleft vs copyright                                            |
 |            |         - 3284434: [pytango][doc] few ERROR during the doc generation               |
+|            |         - 3284435: [pytango][doc] few warning during the doc generation             |
 +------------+-------------------------------------------------------------------------------------+
 | 7.1.4      | Features:                                                                           |
 |            |     - from sourceforge:                                                             |
diff --git a/setup.py b/setup.py
index bc74f37..47538c1 100644
--- a/setup.py
+++ b/setup.py
@@ -459,7 +459,7 @@ class install(dftinstall):
                 global _IPY_ROOT
                 self.ipython_dir = os.path.join(_IPY_ROOT, "Extensions")
         else:
-            if ipython-local:
+            if self.ipython_local:
                 self.warn("Both options 'ipython-dir' and 'ipython-local' were given. " \
                           "'ipython-dir' will be used.")
         self.ensure_dirname('ipython_dir')

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