aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-06-18 18:47:14 +0300
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-06-18 18:47:28 +0300
commita9303a450ebfbf1d069e80818da653cb365f0949 (patch)
treef90ebb98fc8cb1bdb23d0ebcada33bf29dd8270c
parent474f4386751cadde03bc7a6a5b228551a5af7326 (diff)
downloadmeson-a9303a450ebfbf1d069e80818da653cb365f0949.zip
meson-a9303a450ebfbf1d069e80818da653cb365f0949.tar.gz
meson-a9303a450ebfbf1d069e80818da653cb365f0949.tar.bz2
dependency: Undefined variable 'type_string'. Closes #156
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-rw-r--r--dependencies.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/dependencies.py b/dependencies.py
index d5e1025..5173526 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -93,10 +93,10 @@ class PkgConfigDependency(Dependency):
if "pkgconfig" not in environment.cross_info:
raise DependencyException('Pkg-config binary missing from cross file.')
pkgbin = environment.cross_info['pkgconfig']
- type_string = 'Cross'
+ self.type_string = 'Cross'
else:
pkgbin = 'pkg-config'
- type_string = 'Native'
+ self.type_string = 'Native'
self.pkgbin = pkgbin
p = subprocess.Popen([pkgbin, '--modversion', name],
@@ -105,13 +105,13 @@ class PkgConfigDependency(Dependency):
out = p.communicate()[0]
if p.returncode != 0:
if self.required:
- raise DependencyException('%s dependency %s not found.' % (type_string, name))
+ raise DependencyException('%s dependency %s not found.' % (self.type_string, name))
self.modversion = 'none'
self.cargs = []
self.libs = []
else:
self.modversion = out.decode().strip()
- mlog.log('%s dependency' % type_string, mlog.bold(name), 'found:',
+ mlog.log('%s dependency' % self.type_string, mlog.bold(name), 'found:',
mlog.green('YES'), self.modversion)
version_requirement = kwargs.get('version', None)
if version_requirement is None:
@@ -161,7 +161,7 @@ class PkgConfigDependency(Dependency):
if p.returncode != 0:
if self.required:
raise DependencyException('%s dependency %s not found.' %
- (type_string, self.name))
+ (self.type_string, self.name))
else:
variable = out.decode().strip()
mlog.debug('return of subprocess : %s' % variable)