diff options
| author | anatoly techtonik <techtonik@gmail.com> | 2014-08-11 11:53:44 (GMT) |
|---|---|---|
| committer | anatoly techtonik <techtonik@gmail.com> | 2014-08-11 11:53:44 (GMT) |
| commit | 1e802a0856670237facf60687409b37b32cfa4b4 (patch) | |
| tree | 64cb4591f1c22e57f4bba1a6a58f4ef06b3d9686 /src/engine | |
| parent | a035c43fb34cc888fca250f26f68fc2b03c018ac (diff) | |
| download | SCons-1e802a0856670237facf60687409b37b32cfa4b4.zip SCons-1e802a0856670237facf60687409b37b32cfa4b4.tar.gz SCons-1e802a0856670237facf60687409b37b32cfa4b4.tar.bz2 | |
Do not fail on EnsureSConsVersion when running from checkout
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Warnings.py | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index bd515d2..111d091 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -461,6 +461,10 @@ 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__': + SCons.Warnings.warn(SCons.Warnings.DevelopmentVersionWarning, + "EnsureSConsVersion is ignored for development version") + return scons_ver = self._get_major_minor_revision(SCons.__version__) if scons_ver < (major, minor, revision): if revision: diff --git a/src/engine/SCons/Warnings.py b/src/engine/SCons/Warnings.py index ca6acee..5c27825 100644 --- a/src/engine/SCons/Warnings.py +++ b/src/engine/SCons/Warnings.py @@ -54,6 +54,9 @@ class CorruptSConsignWarning(WarningOnByDefault): class DependencyWarning(Warning): pass +class DevelopmentVersionWarning(WarningOnByDefault): + pass + class DuplicateEnvironmentWarning(WarningOnByDefault): pass |