aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjpakkane <jpakkane@gmail.com>2015-03-26 18:04:04 +0200
committerjpakkane <jpakkane@gmail.com>2015-03-26 18:04:04 +0200
commit5e9b9534785739c42fe52c68a909b072fd05873c (patch)
treef714713e7b2671cb22ec9d446799f5c1fc012473
parent94bc5f40334a1339d611812fbd853bde45942135 (diff)
parentcb21489c60f4d0dc6030618205753dc10a074e2d (diff)
downloadmeson-5e9b9534785739c42fe52c68a909b072fd05873c.zip
meson-5e9b9534785739c42fe52c68a909b072fd05873c.tar.gz
meson-5e9b9534785739c42fe52c68a909b072fd05873c.tar.bz2
Merge pull request #87 from ignatenkobrain/wip/gnome
modules/gnome: join 2 isinstance
-rw-r--r--modules/gnome.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gnome.py b/modules/gnome.py
index 458221e..efa7655 100644
--- a/modules/gnome.py
+++ b/modules/gnome.py
@@ -47,7 +47,7 @@ class GnomeModule:
girtarget = args[0]
while hasattr(girtarget, 'held_object'):
girtarget = girtarget.held_object
- if not (isinstance(girtarget, build.Executable) or isinstance(girtarget, build.SharedLibrary)):
+ if not isinstance(girtarget, (build.Executable, build.SharedLibrary)):
raise MesonException('Gir target must be an executable or shared library')
pkgstr = subprocess.check_output(['pkg-config', '--cflags', 'gobject-introspection-1.0'])
pkgargs = pkgstr.decode().strip().split()