From 7005e211a2aaf05626752c0c73d2518d8034911b Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 24 Mar 2020 23:58:04 +0000 Subject: Report an errror if glib-compile-resources is missing Produce a diagnostic if we try to use gnome.compile_resources() when glib-compile-resources isn't present, rather than a python backtrace. --- mesonbuild/modules/gnome.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mesonbuild/modules/gnome.py') diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 76916bb..8317629 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -227,7 +227,10 @@ class GnomeModule(ExtensionModule): for source_dir in source_dirs: cmd += ['--sourcedir', os.path.join(state.subdir, source_dir)] - pc, stdout, stderr = Popen_safe(cmd, cwd=state.environment.get_source_dir()) + try: + pc, stdout, stderr = Popen_safe(cmd, cwd=state.environment.get_source_dir()) + except (FileNotFoundError, PermissionError): + raise MesonException('Could not execute glib-compile-resources.') if pc.returncode != 0: m = 'glib-compile-resources failed to get dependencies for {}:\n{}' mlog.warning(m.format(cmd[1], stderr)) -- cgit v1.1