strips/darwin-apk
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/darwin-apk.git synced 2025-08-04 05:51:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve providers correctly

Browse Source
This commit is contained in:
a dinosaur
2025-07-07 20:12:57 +10:00
parent 1953c00f17
commit 80c063b3c2
3 changed files with 60 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/apk/Index/ApkIndex.swift
View File

@ -1,5 +1,5 @@
/*
* darwin-apk © 2024 Gay Pizza Specifications
* darwin-apk © 2024, 2025 Gay Pizza Specifications
* SPDX-License-Identifier: Apache-2.0
*/
@ -25,21 +25,15 @@ public extension ApkIndex {
func resolve(requirement: ApkVersionRequirement) -> ApkIndexPackage? {
self.packages.first { pkg in
guard pkg.name == requirement.name ||
pkg.provides.contains(where: { $0.name == requirement.name }) else {
return false
}
return requirement.versionSpec.satisfied(by: pkg.version)
return (pkg.name == requirement.name && requirement.versionSpec.satisfied(by: pkg.version))
|| pkg.provides.contains(where: { $0.satisfies(requirement) })
}
}
func resolveIndex(requirement: ApkVersionRequirement) -> Index? {
self.packages.firstIndex { pkg in
guard pkg.name == requirement.name ||
pkg.provides.contains(where: { $0.name == requirement.name }) else {
return false
}
return requirement.versionSpec.satisfied(by: pkg.version)
return (pkg.name == requirement.name && requirement.versionSpec.satisfied(by: pkg.version))
|| pkg.provides.contains(where: { $0.satisfies(requirement) })
}
}
}