aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-04-29 10:01:09 -0400
committerXavier Claessens <xavier.claessens@collabora.com>2020-04-30 09:40:35 -0400
commit4929547b535462f976c88912f7e941195d533183 (patch)
tree409666ace6e3de7a85f5900fd0db084b70e82d66
parent9ddbcd301a601ffb7a271ff583f0ef16464114f5 (diff)
downloadmeson-4929547b535462f976c88912f7e941195d533183.zip
meson-4929547b535462f976c88912f7e941195d533183.tar.gz
meson-4929547b535462f976c88912f7e941195d533183.tar.bz2
gnome: Print proper error when 'nsversion' or 'namespace' are missing
-rw-r--r--mesonbuild/modules/gnome.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 14cb4c4..7629f18 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -732,8 +732,12 @@ class GnomeModule(ExtensionModule):
gir_dep, giscanner, gicompiler = self._get_gir_dep(state)
- ns = kwargs.pop('namespace')
- nsversion = kwargs.pop('nsversion')
+ ns = kwargs.get('namespace')
+ if not ns:
+ raise MesonException('Missing "namespace" keyword argument')
+ nsversion = kwargs.get('nsversion')
+ if not nsversion:
+ raise MesonException('Missing "nsversion" keyword argument')
libsources = mesonlib.extract_as_list(kwargs, 'sources', pop=True)
girfile = '%s-%s.gir' % (ns, nsversion)
srcdir = os.path.join(state.environment.get_source_dir(), state.subdir)