summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2014-09-26 13:17:38 (GMT)
committeranatoly techtonik <techtonik@gmail.com>2014-09-26 13:17:38 (GMT)
commit0b806ea5b203f1ef876f5d91294aaeabdc5a639a (patch)
tree5ee3783961ca3d24c7910777e8082e4d080c13ce /src/engine
parent2a2bb65ba5daa067950ea2be8b13ee812db47241 (diff)
downloadSCons-0b806ea5b203f1ef876f5d91294aaeabdc5a639a.zip
SCons-0b806ea5b203f1ef876f5d91294aaeabdc5a639a.tar.gz
SCons-0b806ea5b203f1ef876f5d91294aaeabdc5a639a.tar.bz2
Split __VERSION__ string in EnsureSConsVersion to avoid replacement
during package build process. This fixes SCons warning that it runs in development mode.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Script/SConscript.py3
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