mirror of
https://github.com/miurahr/aqtinstall.git
synced 2025-12-18 05:04:38 +03:00
Fix list-qt for all_os 6.7.* by updating fetch_versions
Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>
This commit is contained in:
committed by
Alexandre 'Kidev' Poumaroux
parent
2072542a88
commit
a039f9ff9e
@@ -779,13 +779,20 @@ class MetadataFactory:
|
|||||||
return arches
|
return arches
|
||||||
|
|
||||||
def fetch_versions(self, extension: str = "") -> Versions:
|
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:
|
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(
|
versions_extensions = self.get_versions_extensions(
|
||||||
self.fetch_http(self.archive_id.to_url(), False), self.archive_id.category
|
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))
|
grouped = cast(Iterable[Tuple[int, Iterable[Version]]], itertools.groupby(versions, lambda version: version.minor))
|
||||||
|
|
||||||
return Versions(grouped)
|
return Versions(grouped)
|
||||||
|
|||||||
Reference in New Issue
Block a user