diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-12 14:18:51 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-15 04:12:23 +0530 |
commit | 807a53c6fc2e4e4fad12f4f4b6f1343eea30e9c7 (patch) | |
tree | d8b36df9a657ff8f2616b94228a99fb3466002a2 | |
parent | fc540b72a668c6ef4196f5501b0d385822e8657e (diff) | |
download | meson-807a53c6fc2e4e4fad12f4f4b6f1343eea30e9c7.zip meson-807a53c6fc2e4e4fad12f4f4b6f1343eea30e9c7.tar.gz meson-807a53c6fc2e4e4fad12f4f4b6f1343eea30e9c7.tar.bz2 |
PkgConfigDependency.version_reqs must be a list
If it isn't, the --target-glib check in generate_vala_compile will
iterate over the version_reqs as a string and fail to add the
--target-glib argument.
-rw-r--r-- | mesonbuild/dependencies.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index 606719c..7306201 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -145,6 +145,8 @@ class PkgConfigDependency(Dependency): else: if not isinstance(self.version_reqs, (str, list)): raise DependencyException('Version argument must be string or list.') + if isinstance(self.version_reqs, str): + self.version_reqs = [self.version_reqs] (self.is_found, not_found, found) = \ version_compare_many(self.modversion, self.version_reqs) if not self.is_found: @@ -169,6 +171,11 @@ class PkgConfigDependency(Dependency): # Fetch the libraries and library paths needed for using this self._set_libs() + def __repr__(self): + s = '<{0} {1}: {2} {3}>' + return s.format(self.__class__.__name__, self.name, self.is_found, + self.version_reqs) + def _call_pkgbin(self, args): p, out = Popen_safe([self.pkgbin] + args, env=os.environ)[0:2] return (p.returncode, out.strip()) |