diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 22:20:34 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 22:20:34 +0200 |
commit | 4afc984101977fdff83c8b3ed7c26fcaf1a0030e (patch) | |
tree | 58016e3c49b02a7d08effd2258dcf80c8af37350 /src/engine/SCons/Script/SConscript.py | |
parent | a414d8e46960130a36b0bde5de3bef8cbd769e13 (diff) | |
parent | a2795b63dd02ecddd8a0109dcc1b64108f68eace (diff) |
Merge tag 'upstream/2.3.4'
Upstream version 2.3.4
Diffstat (limited to 'src/engine/SCons/Script/SConscript.py')
-rw-r--r-- | src/engine/SCons/Script/SConscript.py | 5 |
1 files changed, 3 insertions, 2 deletions
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 |