diff options
| -rw-r--r-- | mesonbuild/dependencies/base.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index fac7435..6f8181d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -388,7 +388,7 @@ class ConfigToolDependency(ExternalDependency): tools = None tool_name = None - __strip_version = re.compile(r'^[0-9.]*') + __strip_version = re.compile(r'^[0-9][0-9.]+') def __init__(self, name, environment, kwargs, language: T.Optional[str] = None): super().__init__('config-tool', environment, kwargs, language=language) diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 09f7ff5..c29ed89 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -547,7 +547,7 @@ class ExternalProgramHolder(InterpreterObject, ObjectHolder): output = res.stdout.strip() if not output: output = res.stderr.strip() - match = re.search(r'([0-9\.]+)', output) + match = re.search(r'([0-9][0-9\.]+)', output) if not match: m = 'Could not find a version number in output of {!r}' raise InterpreterException(m.format(raw_cmd)) |