system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-10-05 23:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(provide): fix provides not finding pagure-database=5.1.0

Browse source
This commit is contained in:
jguer 2020-10-06 06:25:18 +02:00
parent 678d10e04e
commit 7979279c3f
No known key found for this signature in database
GPG key ID: 6D6CC9BEA8556B35
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/dep/dep.go
View file

@ -74,7 +74,7 @@ func pkgSatisfies(name, version, dep string) bool {
return verSatisfies(version, depMod, depVersion)
}
func provideSatisfies(provide, dep string) bool {
func provideSatisfies(provide, dep, pkgVersion string) bool {
depName, depMod, depVersion := splitDep(dep)
provideName, provideMod, provideVersion := splitDep(provide)
@ -84,7 +84,7 @@ func provideSatisfies(provide, dep string) bool {
// Unversioned provieds can not satisfy a versioned dep
if provideMod == "" && depMod != "" {
return false
provideVersion = pkgVersion // Example package: pagure
}
return verSatisfies(provideVersion, depMod, depVersion)
@ -113,7 +113,7 @@ func satisfiesAur(dep string, pkg *rpc.Pkg) bool {
}
for _, provide := range pkg.Provides {
if provideSatisfies(provide, dep) {
if provideSatisfies(provide, dep, pkg.Version) {
return true
}
}
@ -127,7 +127,7 @@ func satisfiesRepo(dep string, pkg alpm.IPackage, dbExecutor db.Executor) bool {
}
for _, provided := range dbExecutor.PackageProvides(pkg) {
if provideSatisfies(provided.String(), dep) {
if provideSatisfies(provided.String(), dep, pkg.Version()) {
return true
}
}

2
pkg/dep/depPool.go
View file

@ -416,7 +416,7 @@ func (dp *Pool) findSatisfierAurCache(dep string, ignoreProviders, noConfirm, pr
}
for _, provide := range pkg.Provides {
if provideSatisfies(provide, dep) {
if provideSatisfies(provide, dep, pkg.Version) {
providerSlice.Pkgs = append(providerSlice.Pkgs, pkg)
seen.Set(pkg.Name)
continue