diff options
| author | William Deegan <bill@baddogconsulting.com> | 2013-10-28 02:04:46 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2013-10-28 02:04:46 (GMT) |
| commit | e38f59cab5d40f09f15c5e65645aa2d8af165c66 (patch) | |
| tree | d50c9d77698c3a82fcc4b64a5ff61b79c20a76f2 /src/engine/SCons/Environment.py | |
| parent | e7888b15628b09af093621825b78df5cbcead088 (diff) | |
| parent | 2be0f31b80087974b5e6d53e12542637636a2253 (diff) | |
| download | SCons-e38f59cab5d40f09f15c5e65645aa2d8af165c66.zip SCons-e38f59cab5d40f09f15c5e65645aa2d8af165c66.tar.gz SCons-e38f59cab5d40f09f15c5e65645aa2d8af165c66.tar.bz2 | |
Merged in dirkbaechle/scons (pull request #92)
Fix: now counting instances only when requested via --debug=count (#2922)
Diffstat (limited to 'src/engine/SCons/Environment.py')
| -rw-r--r-- | src/engine/SCons/Environment.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 55a8206..ca5df58 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -43,6 +43,7 @@ from collections import UserDict import SCons.Action import SCons.Builder +import SCons.Debug from SCons.Debug import logInstanceCreation import SCons.Defaults import SCons.Errors @@ -370,7 +371,7 @@ class SubstitutionEnvironment(object): def __init__(self, **kw): """Initialization of an underlying SubstitutionEnvironment class. """ - if __debug__: logInstanceCreation(self, 'Environment.SubstitutionEnvironment') + if SCons.Debug.track_instances: logInstanceCreation(self, 'Environment.SubstitutionEnvironment') self.fs = SCons.Node.FS.get_default_fs() self.ans = SCons.Node.Alias.default_ans self.lookup_list = SCons.Node.arg2nodes_lookups @@ -931,7 +932,7 @@ class Base(SubstitutionEnvironment): initialize things in a very specific order that doesn't work with the much simpler base class initialization. """ - if __debug__: logInstanceCreation(self, 'Environment.Base') + if SCons.Debug.track_instances: logInstanceCreation(self, 'Environment.Base') self._memo = {} self.fs = SCons.Node.FS.get_default_fs() self.ans = SCons.Node.Alias.default_ans @@ -1414,7 +1415,7 @@ class Base(SubstitutionEnvironment): # Finally, apply any flags to be merged in if parse_flags: clone.MergeFlags(parse_flags) - if __debug__: logInstanceCreation(self, 'Environment.EnvironmentClone') + if SCons.Debug.track_instances: logInstanceCreation(self, 'Environment.EnvironmentClone') return clone def Copy(self, *args, **kw): @@ -2270,7 +2271,7 @@ class OverrideEnvironment(Base): """ def __init__(self, subject, overrides={}): - if __debug__: logInstanceCreation(self, 'Environment.OverrideEnvironment') + if SCons.Debug.track_instances: logInstanceCreation(self, 'Environment.OverrideEnvironment') self.__dict__['__subject'] = subject self.__dict__['overrides'] = overrides |