aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-04-01 20:10:34 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-04-01 20:10:34 +0300
commit2ed81e939a62a1d83382de3a13bd30f6146b7117 (patch)
tree048934a92dd033a68031eaa42c45c6b64f586b23
parent35f3495c1deba8edcb75136c1948a41eaffb1e92 (diff)
downloadmeson-2ed81e939a62a1d83382de3a13bd30f6146b7117.zip
meson-2ed81e939a62a1d83382de3a13bd30f6146b7117.tar.gz
meson-2ed81e939a62a1d83382de3a13bd30f6146b7117.tar.bz2
Print version strings on error.
-rw-r--r--dependencies.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/dependencies.py b/dependencies.py
index 7501742..29e9a68 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -312,15 +312,15 @@ class Qt5Dependency(Dependency):
if self.moc.found():
mp = subprocess.Popen([self.moc.get_command(), '-v'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- moc_ver = mp.communicate()[1].decode()
+ moc_ver = mp.communicate()[1].decode().strip()
if 'Qt 5' not in moc_ver:
- raise DependencyException('Moc preprocessor is not for Qt 5.')
+ raise DependencyException('Moc preprocessor is not for Qt 5. Output: %s' % moc_ver)
if self.uic.found():
up = subprocess.Popen([self.uic.get_command(), '-v'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- uic_ver = up.communicate()[1].decode()
+ uic_ver = up.communicate()[1].decode().strip()
if 'version 5.' not in uic_ver:
- raise DependencyException('Uic compiler is not for Qt 5.')
+ raise DependencyException('Uic compiler is not for Qt 5. Output: %s' % uic_ver)
def get_version(self):
return self.modules[0].get_version()