diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-12-27 09:24:37 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-12-27 09:24:37 +0100 |
commit | 57f8e3b0a87f64b41168b46512e1dc670ac98850 (patch) | |
tree | 8c82677383ee329301e24f1e72f096a1a673b6e6 /engine/SCons/Node/__init__.py | |
parent | 5dcfdef50f9721ffaa466bf23721b823141c1e0d (diff) | |
parent | 257ef5bf6b309099d29421eca428df9ff43fc646 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'engine/SCons/Node/__init__.py')
-rw-r--r-- | engine/SCons/Node/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/SCons/Node/__init__.py b/engine/SCons/Node/__init__.py index c1f8d89..32f4bba 100644 --- a/engine/SCons/Node/__init__.py +++ b/engine/SCons/Node/__init__.py @@ -43,7 +43,7 @@ from __future__ import print_function # 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/Node/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan" +__revision__ = "src/engine/SCons/Node/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan" import os import collections @@ -614,6 +614,7 @@ class Node(object, with_metaclass(NoSlotsPyPy)): self._func_rexists = 1 self._func_get_contents = 0 self._func_target_from_source = 0 + self.ninfo = None self.clear_memoized_values() @@ -1131,11 +1132,10 @@ class Node(object, with_metaclass(NoSlotsPyPy)): return ninfo def get_ninfo(self): - try: - return self.ninfo - except AttributeError: - self.ninfo = self.new_ninfo() + if self.ninfo is not None: return self.ninfo + self.ninfo = self.new_ninfo() + return self.ninfo def new_binfo(self): binfo = self.BuildInfo() |