From a039f9ff9e80e536701d43fe7b20ecffaad012bd Mon Sep 17 00:00:00 2001 From: "J.D. Purcell" Date: Thu, 24 Apr 2025 09:54:21 +0200 Subject: [PATCH] Fix list-qt for all_os 6.7.* by updating fetch_versions Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com> --- aqt/metadata.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/aqt/metadata.py b/aqt/metadata.py index ed41f9b..5989f22 100644 --- a/aqt/metadata.py +++ b/aqt/metadata.py @@ -779,13 +779,20 @@ class MetadataFactory: return arches def fetch_versions(self, extension: str = "") -> Versions: + def match_any_ext(ver: Version) -> bool: + return ( + self.archive_id.host == "all_os" + and self.archive_id.target in {"wasm", "android"} + and ver in SimpleSpec("6.7.*") + ) + def filter_by(ver: Version, ext: str) -> bool: - return (self.spec is None or ver in self.spec) and ext == extension + return (self.spec is None or ver in self.spec) and (ext == extension or match_any_ext(ver)) versions_extensions = self.get_versions_extensions( self.fetch_http(self.archive_id.to_url(), False), self.archive_id.category ) - versions = sorted([ver for ver, ext in versions_extensions if ver is not None and filter_by(ver, ext)]) + versions = sorted({ver for ver, ext in versions_extensions if ver is not None and filter_by(ver, ext)}) grouped = cast(Iterable[Tuple[int, Iterable[Version]]], itertools.groupby(versions, lambda version: version.minor)) return Versions(grouped)