aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-12-15 22:20:03 +0200
committerGitHub <noreply@github.com>2016-12-15 22:20:03 +0200
commit21e475b64b2eaadfc9f5209562d008999417ee7d (patch)
treecc4aaddfc75f60751c3c1ccc0c7a41343ae7b6ad /mesonbuild/dependencies.py
parent925f880e6ba4155a9a2d9b075cde20eff25039ca (diff)
parentff8cdf86f4a36290156424bfeb5efbde788a5953 (diff)
downloadmeson-21e475b64b2eaadfc9f5209562d008999417ee7d.zip
meson-21e475b64b2eaadfc9f5209562d008999417ee7d.tar.gz
meson-21e475b64b2eaadfc9f5209562d008999417ee7d.tar.bz2
Merge pull request #1194 from centricular/critical-bugfixes-vala
A bunch of bugfixes for Vala
Diffstat (limited to 'mesonbuild/dependencies.py')
-rw-r--r--mesonbuild/dependencies.py7
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())