[Numpy-svn] r4754 - branches/build_with_scons/numpy/distutils/command

numpy-svn@scip... numpy-svn@scip...
Fri Jan 25 00:58:50 CST 2008


Author: cdavid
Date: 2008-01-25 00:58:46 -0600 (Fri, 25 Jan 2008)
New Revision: 4754

Modified:
   branches/build_with_scons/numpy/distutils/command/scons.py
Log:
Return as soon as possible of no sconscripts is detected in scons command, to
avoid importing numscons when not needed


Modified: branches/build_with_scons/numpy/distutils/command/scons.py
===================================================================
--- branches/build_with_scons/numpy/distutils/command/scons.py	2008-01-25 06:51:35 UTC (rev 4753)
+++ branches/build_with_scons/numpy/distutils/command/scons.py	2008-01-25 06:58:46 UTC (rev 4754)
@@ -273,6 +273,9 @@
                 raise RuntimeError("importing numscons failed (error was %s), using " \
                                    "scons within distutils is not possible without "
                                    "this package " % str(e))
+        else:
+            # nothing to do, just leave it here.
+            return
         # XXX: when a scons script is missing, scons only prints warnings, and
         # does not return a failure (status is 0). We have to detect this from
         # distutils (this cannot work for recursive scons builds...)



More information about the Numpy-svn mailing list