aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/ui.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-06-09 23:23:38 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2017-06-10 00:20:03 +0530
commitc1e9c757ebbe7a26b126ee8cb2106f6f8dffa322 (patch)
tree4e1c2a53bead4fe079a7fc40eff3d2c36293da56 /mesonbuild/dependencies/ui.py
parentb6b3905325884c5fd2a502d09680b5a35564f0df (diff)
downloadmeson-c1e9c757ebbe7a26b126ee8cb2106f6f8dffa322.zip
meson-c1e9c757ebbe7a26b126ee8cb2106f6f8dffa322.tar.gz
meson-c1e9c757ebbe7a26b126ee8cb2106f6f8dffa322.tar.bz2
tests: Increase dependencies coverage a bit more
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
-rw-r--r--mesonbuild/dependencies/ui.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
index 7a66a2d..8537a7e 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -427,7 +427,6 @@ class WxDependency(ExternalDependency):
if WxDependency.wx_found is None:
self.check_wxconfig()
if not WxDependency.wx_found:
- # FIXME: this message could be printed after Dependncy found
mlog.log("Neither wx-config-3.0 nor wx-config found; can't detect dependency")
return
@@ -466,11 +465,11 @@ class WxDependency(ExternalDependency):
if modules not in kwargs:
return []
candidates = kwargs[modules]
- if isinstance(candidates, str):
- return [candidates]
+ if not isinstance(candidates, list):
+ candidates = [candidates]
for c in candidates:
if not isinstance(c, str):
- raise DependencyException('wxwidgets module argument is not a string.')
+ raise DependencyException('wxwidgets module argument is not a string')
return candidates
def check_wxconfig(self):