diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2013-03-11 22:33:29 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2013-03-11 22:33:29 +0100 |
| commit | e5a4f8c6dbf0dcfc74bfd8ba99099d9fe1064642 (patch) | |
| tree | cf4f35e2a3b56525cf8c19a1b8fb3147d36f0229 /src/engine/SCons/Environment.py | |
| parent | 2323daae4add07272c0f4feb9243c352a9ca4b18 (diff) | |
| parent | cb3425abe0bc2d05caf401ca24b82a25a81f009d (diff) | |
Merge tag 'upstream/2.3.0'
Upstream version 2.3.0
Diffstat (limited to 'src/engine/SCons/Environment.py')
| -rw-r--r-- | src/engine/SCons/Environment.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index addf782..833f3cc 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -10,7 +10,7 @@ Environment """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -31,7 +31,7 @@ Environment # 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/Environment.py issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo" +__revision__ = "src/engine/SCons/Environment.py 2013/03/03 09:48:35 garyo" import copy @@ -2247,6 +2247,7 @@ class Base(SubstitutionEnvironment): install._UNIQUE_INSTALLED_FILES = SCons.Util.uniquer_hashables(install._INSTALLED_FILES) return install._UNIQUE_INSTALLED_FILES + class OverrideEnvironment(Base): """A proxy that overrides variables in a wrapped construction environment by returning values from an overrides dictionary in |