From a0b9744adbebdd4a535d979e7172de3fdcc36e15 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 9 Dec 2024 14:49:02 -0800 Subject: [PATCH] dependencies: version_compare -> version_compare_many It's possible to get an array of versions here, so we need to handle that. --- mesonbuild/dependencies/dev.py | 2 +- mesonbuild/dependencies/misc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 94f51ff69b12..95ac9c4e1883 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -584,7 +584,7 @@ def __init__(self, environment: 'Environment', kwargs: JNISystemDependencyKW): self.is_found = False return - if 'version' in kwargs and not version_compare(self.version, kwargs['version']): + if 'version' in kwargs and not version_compare_many(self.version, kwargs['version']): mlog.error(f'Incorrect JDK version found ({self.version}), wanted {kwargs["version"]}') self.is_found = False return diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 8fdf619f0c52..6a2a73f2f0e8 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -392,7 +392,7 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]): req = kwargs.get('version') if req: if self.version: - self.is_found = mesonlib.version_compare(self.version, req) + self.is_found, *_ = mesonlib.version_compare_many(self.version, req) else: mlog.warning('Cannot determine version of curses to compare against.')