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(deps): fix wrong method implementation

Browse source
This commit is contained in:
jguer 2020-08-19 00:30:15 +02:00
parent 7b70462a7c
commit ce79d53eb2
No known key found for this signature in database
GPG key ID: 6D6CC9BEA8556B35
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
download.go
View file

@ -224,7 +224,7 @@ func getPkgbuildsfromABS(pkgs []string, path string, dbExecutor db.Executor, for
pkgDB, name := text.SplitDBFromName(pkgN)
if pkgDB != "" {
pkg = dbExecutor.PackageFromDB(name, pkgDB)
pkg = dbExecutor.SatisfierFromDB(name, pkgDB)
} else {
pkg = dbExecutor.SyncSatisfier(name)
}

2
pkg/db/executor.go
View file

@ -32,7 +32,7 @@ type Executor interface {
LocalSatisfierExists(string) bool
PackageConflicts(RepoPackage) []alpm.Depend
PackageDepends(RepoPackage) []alpm.Depend
PackageFromDB(string, string) RepoPackage
SatisfierFromDB(string, string) RepoPackage
PackageGroups(RepoPackage) []string
PackageOptionalDepends(RepoPackage) []alpm.Depend
PackageProvides(RepoPackage) []alpm.Depend

2
pkg/db/ialpm/alpm.go
View file

@ -342,7 +342,7 @@ func (ae *AlpmExecutor) LocalPackage(pkgName string) db.RepoPackage {
return pkg
}
func (ae *AlpmExecutor) PackageFromDB(pkgName, dbName string) db.RepoPackage {
func (ae *AlpmExecutor) SatisfierFromDB(pkgName, dbName string) db.RepoPackage {
singleDB, err := ae.handle.SyncDBByName(dbName)
if err != nil {
return nil

6
pkg/dep/depPool.go
View file

@ -110,7 +110,7 @@ func (dp *Pool) ResolveTargets(pkgs []string,
// If there'ss a different prefix only look in that repo
if target.DB != "" {
foundPkg = dp.AlpmExecutor.PackageFromDB(target.DepString(), target.DB)
foundPkg = dp.AlpmExecutor.SatisfierFromDB(target.DepString(), target.DB)
} else {
// otherwise find it in any repo
foundPkg = dp.AlpmExecutor.SyncSatisfier(target.DepString())
@ -201,7 +201,7 @@ func (dp *Pool) findProvides(pkgs stringset.StringSet) error {
}
for pkg := range pkgs {
if dp.AlpmExecutor.LocalSatisfierExists(pkg) {
if dp.AlpmExecutor.LocalPackage(pkg) != nil {
continue
}
wg.Add(1)
@ -384,7 +384,7 @@ func (dp *Pool) findSatisfierAurCache(dep string, ignoreProviders, noConfirm, pr
seen := make(stringset.StringSet)
providerSlice := makeProviders(depName)
if dp.AlpmExecutor.LocalSatisfierExists(depName) {
if dp.AlpmExecutor.LocalPackage(depName) != nil {
if pkg, ok := dp.AurCache[dep]; ok && pkgSatisfies(pkg.Name, pkg.Version, dep) {
return pkg
}