summaryrefslogtreecommitdiffstats
path: root/waftools
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-29 23:31:17 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-29 23:31:17 +0100
commit6565c0d979b531d5aee29872f20d33eaeb2098ed (patch)
tree82c175c68cd3eb443d06a8cfc92f7904d9aba017 /waftools
parentfa620ffc956953b39bb683abb2679bbbfc364915 (diff)
downloadmpv-6565c0d979b531d5aee29872f20d33eaeb2098ed.tar.bz2
mpv-6565c0d979b531d5aee29872f20d33eaeb2098ed.tar.xz
build: make deps_neg work with multiple dependencies
Previous code only worked id len(deps_neg) was 1.
Diffstat (limited to 'waftools')
-rw-r--r--waftools/dependencies.py4
1 files 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