From c335eeae504cbcee2d27604232dc7e8b7e4d3caa Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 27 Oct 2025 10:45:41 -0700 Subject: dependencies: Catch non MesonException in detect and give better message --- mesonbuild/dependencies/detect.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mesonbuild') diff --git a/mesonbuild/dependencies/detect.py b/mesonbuild/dependencies/detect.py index 295689db2..97eeb21cd 100644 --- a/mesonbuild/dependencies/detect.py +++ b/mesonbuild/dependencies/detect.py @@ -9,7 +9,7 @@ import typing as T from .base import DependencyCandidate, ExternalDependency, DependencyException, DependencyMethods, NotFoundDependency -from ..mesonlib import listify, PerMachine, MesonBugException +from ..mesonlib import listify, PerMachine, MesonBugException, MesonException from .. import mlog if T.TYPE_CHECKING: @@ -124,6 +124,11 @@ def find_external_dependency(name: str, env: 'Environment', kwargs: DependencyOb mlog.debug(bettermsg) e.args = (bettermsg,) pkg_exc.append(e) + except MesonException: + raise + except Exception as e: + bettermsg = f'Dependency lookup for {name} with method {c.method!r} failed: {e}' + raise MesonBugException(bettermsg) from e else: pkg_exc.append(None) details = d.log_details() -- cgit v1.2.3