From 6565c0d979b531d5aee29872f20d33eaeb2098ed Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Fri, 29 Nov 2013 23:31:17 +0100 Subject: build: make deps_neg work with multiple dependencies Previous code only worked id len(deps_neg) was 1. --- waftools/dependencies.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/waftools/dependencies.py b/waftools/dependencies.py index f83f29fc38..aa638f0219 100644 --- a/waftools/dependencies.py +++ b/waftools/dependencies.py @@ -86,8 +86,8 @@ the autodetection check failed.".format(self.identifier) def check_negative_dependencies(self): if 'deps_neg' in self.attributes: deps = set(self.attributes['deps_neg']) - if deps <= self.satisfied_deps: - conflicting_deps = deps & self.satisfied_deps + conflicting_deps = deps & self.satisfied_deps + if len(conflicting_deps) > 0: self.skip("{0} found".format(", ".join(conflicting_deps)), 'CYAN') raise DependencyError -- cgit v1.2.3