From 322f447e0aed9d6a1c8e5f59bb929239d361a0d3 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sat, 12 Aug 2017 16:31:51 +0200 Subject: [PATCH] Remove one Node class assumption in Task.py Tasks cannot assume that additional dependency (deps_man) belong to the same Node object class before obtaining their signatures --- waflib/Task.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/waflib/Task.py b/waflib/Task.py index 13c636bb..1c987eb6 100644 --- a/waflib/Task.py +++ b/waflib/Task.py @@ -735,10 +735,11 @@ class Task(TaskBase): continue for v in d: - if isinstance(v, bld.root.__class__): + try: v = v.get_bld_sig() - elif hasattr(v, '__call__'): - v = v() # dependency is a function, call it + except AttributeError: + if hasattr(v, '__call__'): + v = v() # dependency is a function, call it upd(v) def sig_vars(self):