From a2795b63dd02ecddd8a0109dcc1b64108f68eace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 29 Sep 2014 22:20:31 +0200 Subject: Imported Upstream version 2.3.4 --- src/engine/SCons/Script/SConscript.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (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 8e1a662..a0f6569 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/08/24 12:12:31 garyo" +__revision__ = "src/engine/SCons/Script/SConscript.py 2014/09/27 12:51:43 garyo" import SCons import SCons.Action @@ -461,7 +461,8 @@ 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': + # split string to avoid replacement during build process + if SCons.__version__ == '__' + 'VERSION__': SCons.Warnings.warn(SCons.Warnings.DevelopmentVersionWarning, "EnsureSConsVersion is ignored for development version") return -- cgit v1.2.3