From 16bc58049adac72cb1f398d9f89e42757bb4a22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 25 Aug 2014 15:33:07 +0200
Subject: Imported Upstream version 2.3.3

---
 src/engine/SCons/Script/Interactive.py     | 2 +-
 src/engine/SCons/Script/Main.py            | 2 +-
 src/engine/SCons/Script/MainTests.py       | 2 +-
 src/engine/SCons/Script/SConsOptions.py    | 2 +-
 src/engine/SCons/Script/SConscript.py      | 6 +++++-
 src/engine/SCons/Script/SConscriptTests.py | 2 +-
 src/engine/SCons/Script/__init__.py        | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/engine/SCons/Script')

diff --git a/src/engine/SCons/Script/Interactive.py b/src/engine/SCons/Script/Interactive.py
index b800882..a09ef87 100644
--- a/src/engine/SCons/Script/Interactive.py
+++ b/src/engine/SCons/Script/Interactive.py
@@ -20,7 +20,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "src/engine/SCons/Script/Interactive.py  2014/07/05 09:42:21 garyo"
+__revision__ = "src/engine/SCons/Script/Interactive.py  2014/08/24 12:12:31 garyo"
 
 __doc__ = """
 SCons interactive mode
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index b38f13f..f0fcace 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -34,7 +34,7 @@ deprecated_python_version = (2, 7, 0)
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "src/engine/SCons/Script/Main.py  2014/07/05 09:42:21 garyo"
+__revision__ = "src/engine/SCons/Script/Main.py  2014/08/24 12:12:31 garyo"
 
 import SCons.compat
 
diff --git a/src/engine/SCons/Script/MainTests.py b/src/engine/SCons/Script/MainTests.py
index 879ee4f..eedd99c 100644
--- a/src/engine/SCons/Script/MainTests.py
+++ b/src/engine/SCons/Script/MainTests.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Script/MainTests.py  2014/07/05 09:42:21 garyo"
+__revision__ = "src/engine/SCons/Script/MainTests.py  2014/08/24 12:12:31 garyo"
 
 import unittest
 
diff --git a/src/engine/SCons/Script/SConsOptions.py b/src/engine/SCons/Script/SConsOptions.py
index 10c3a98..7a52f6b 100644
--- a/src/engine/SCons/Script/SConsOptions.py
+++ b/src/engine/SCons/Script/SConsOptions.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Script/SConsOptions.py  2014/07/05 09:42:21 garyo"
+__revision__ = "src/engine/SCons/Script/SConsOptions.py  2014/08/24 12:12:31 garyo"
 
 import optparse
 import re
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index 9f837aa..8e1a662 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/07/05 09:42:21 garyo"
+__revision__ = "src/engine/SCons/Script/SConscript.py  2014/08/24 12:12:31 garyo"
 
 import SCons
 import SCons.Action
@@ -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__ == '2.3.3':
+            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/Script/SConscriptTests.py b/src/engine/SCons/Script/SConscriptTests.py
index 807d263..86852f1 100644
--- a/src/engine/SCons/Script/SConscriptTests.py
+++ b/src/engine/SCons/Script/SConscriptTests.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Script/SConscriptTests.py  2014/07/05 09:42:21 garyo"
+__revision__ = "src/engine/SCons/Script/SConscriptTests.py  2014/08/24 12:12:31 garyo"
 
 import SCons.Script.SConscript
 
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index d327753..ed94b9a 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -34,7 +34,7 @@ it goes here.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Script/__init__.py  2014/07/05 09:42:21 garyo"
+__revision__ = "src/engine/SCons/Script/__init__.py  2014/08/24 12:12:31 garyo"
 
 import time
 start_time = time.time()
-- 
cgit v1.2.3