diff options
| author | Alexandre Feblot <devnull@localhost> | 2014-11-12 20:25:39 (GMT) |
|---|---|---|
| committer | Alexandre Feblot <devnull@localhost> | 2014-11-12 20:25:39 (GMT) |
| commit | a077d347e339f38cd5559252c0234b63370bf567 (patch) | |
| tree | e4a4827dcafc9cdca7d3e8e54f9c3246cc757fec /src/engine/SCons/Script/SConscript.py | |
| parent | c60c51f29fa2044ec13b8a3160e2f26bb3531497 (diff) | |
| parent | 2d510c98fe10cbdc8328da7baea83b2ea74c0788 (diff) | |
| download | SCons-a077d347e339f38cd5559252c0234b63370bf567.zip SCons-a077d347e339f38cd5559252c0234b63370bf567.tar.gz SCons-a077d347e339f38cd5559252c0234b63370bf567.tar.bz2 | |
merge from mainlaine
Diffstat (limited to 'src/engine/SCons/Script/SConscript.py')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 111d091..f4a7f07 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -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__ == '__VERSION__': + # 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 |