aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjpakkane <jpakkane@gmail.com>2015-06-18 18:28:33 +0300
committerjpakkane <jpakkane@gmail.com>2015-06-18 18:28:33 +0300
commit7f2b2a62ad299303cd5780dede94e0b5ce5d2ad0 (patch)
treefc9e31275557022c533764e146db7aef4dd3af5c
parent528e817bca83b67c1af4a984e09ca223bbae9776 (diff)
parent25176f2368559e3fda0fd1fc979a61d860287ba8 (diff)
downloadmeson-7f2b2a62ad299303cd5780dede94e0b5ce5d2ad0.zip
meson-7f2b2a62ad299303cd5780dede94e0b5ce5d2ad0.tar.gz
meson-7f2b2a62ad299303cd5780dede94e0b5ce5d2ad0.tar.bz2
Merge pull request #155 from mesonbuild/lint
dependencies: Undefined variable 'required'. Closes #154
-rw-r--r--dependencies.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/dependencies.py b/dependencies.py
index 3dea5ca..f6d509b 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -73,7 +73,7 @@ class PkgConfigDependency(Dependency):
def __init__(self, name, environment, kwargs):
Dependency.__init__(self)
- required = kwargs.get('required', True)
+ self.required = kwargs.get('required', True)
if 'native' in kwargs and environment.is_cross_build():
want_cross = not kwargs['native']
else:
@@ -84,7 +84,7 @@ class PkgConfigDependency(Dependency):
self.is_found = False
if not PkgConfigDependency.pkgconfig_found:
- if required:
+ if self.required:
raise DependencyException('Pkg-config not found.')
self.cargs = []
self.libs = []
@@ -103,7 +103,7 @@ class PkgConfigDependency(Dependency):
stderr=subprocess.PIPE)
out = p.communicate()[0]
if p.returncode != 0:
- if required:
+ if self.required:
raise DependencyException('%s dependency %s not found.' % (type_string, name))
self.modversion = 'none'
self.cargs = []
@@ -119,7 +119,7 @@ class PkgConfigDependency(Dependency):
if not isinstance(version_requirement, str):
raise DependencyException('Version argument must be string.')
self.is_found = mesonlib.version_compare(self.modversion, version_requirement)
- if not self.is_found and required:
+ if not self.is_found and self.required:
raise DependencyException('Invalid version of a dependency, needed %s %s found %s.' % (name, version_requirement, self.modversion))
if not self.is_found:
return
@@ -156,7 +156,7 @@ class PkgConfigDependency(Dependency):
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out = p.communicate()[0]
if p.returncode != 0:
- if required:
+ if self.required:
raise DependencyException('%s dependency %s not found.' %
(type_string, self.name))
else: