diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 20:22:55 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 20:22:55 +0200 |
| commit | 0b1559616669d8a8c28dcd78f192c051efec323b (patch) | |
| tree | 8026a245654dcbaab45384972a02a7166af58db5 /engine/SCons/Script/SConscript.py | |
| parent | 9ddba95984d3c5bcc02deb636244cac8f1fd686f (diff) | |
| parent | 665e78e013bc207a5ec35e4bc41daf2e464f6ed3 (diff) | |
Merge tag 'upstream/2.3.4'
Upstream version 2.3.4
Diffstat (limited to 'engine/SCons/Script/SConscript.py')
| -rw-r--r-- | engine/SCons/Script/SConscript.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/SCons/Script/SConscript.py b/engine/SCons/Script/SConscript.py index 8e1a662..a0f6569 100644 --- a/engine/SCons/Script/SConscript.py +++ b/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 |