Skip to content

Commit 0718934

Browse files
committed
dependencies: Catch non MesonException in detect and give better message
1 parent 47e4ea4 commit 0718934

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

mesonbuild/dependencies/detect.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from .base import DependencyCandidate, ExternalDependency, DependencyException, DependencyMethods, NotFoundDependency
1111

12-
from ..mesonlib import listify, PerMachine, MesonBugException
12+
from ..mesonlib import listify, PerMachine, MesonBugException, MesonException
1313
from .. import mlog
1414

1515
if T.TYPE_CHECKING:
@@ -124,6 +124,11 @@ def find_external_dependency(name: str, env: 'Environment', kwargs: DependencyOb
124124
mlog.debug(bettermsg)
125125
e.args = (bettermsg,)
126126
pkg_exc.append(e)
127+
except MesonException:
128+
raise
129+
except Exception as e:
130+
bettermsg = f'Dependency lookup for {name} with method {c.method!r} failed: {e}'
131+
raise MesonBugException(bettermsg)
127132
else:
128133
pkg_exc.append(None)
129134
details = d.log_details()

0 commit comments

Comments
 (0)