From 16bc58049adac72cb1f398d9f89e42757bb4a22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Aug 2014 15:33:07 +0200 Subject: Imported Upstream version 2.3.3 --- src/engine/SCons/Script/SConscript.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/engine/SCons/Script/SConscript.py') diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 9f837aa..8e1a662 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -28,7 +28,7 @@ files. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. from __future__ import division -__revision__ = "src/engine/SCons/Script/SConscript.py 2014/07/05 09:42:21 garyo" +__revision__ = "src/engine/SCons/Script/SConscript.py 2014/08/24 12:12:31 garyo" import SCons import SCons.Action @@ -461,6 +461,10 @@ class SConsEnvironment(SCons.Environment.Base): def EnsureSConsVersion(self, major, minor, revision=0): """Exit abnormally if the SCons version is not late enough.""" + if SCons.__version__ == '2.3.3': + SCons.Warnings.warn(SCons.Warnings.DevelopmentVersionWarning, + "EnsureSConsVersion is ignored for development version") + return scons_ver = self._get_major_minor_revision(SCons.__version__) if scons_ver < (major, minor, revision): if revision: -- cgit v1.2.3