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 regression on CombinedDepList

Browse source
This commit is contained in:
jguer 2021-05-08 00:29:33 +02:00
parent 662c630a08
commit 8e6d098ff8
No known key found for this signature in database
GPG key ID: 6D6CC9BEA8556B35
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/dep/depOrder.go
View file

@ -31,13 +31,9 @@ func GetOrder(dp *Pool, noDeps, noCheckDeps bool) *Order {
if aurPkg := dp.Aur[dep]; aurPkg != nil && pkgSatisfies(aurPkg.Name, aurPkg.Version, dep) {
do.orderPkgAur(aurPkg, dp, true, noDeps, noCheckDeps)
}
if aurPkg := dp.findSatisfierAur(dep); aurPkg != nil {
} else if aurPkg := dp.findSatisfierAur(dep); aurPkg != nil {
do.orderPkgAur(aurPkg, dp, true, noDeps, noCheckDeps)
}
if repoPkg := dp.findSatisfierRepo(dep); repoPkg != nil {
} else if repoPkg := dp.findSatisfierRepo(dep); repoPkg != nil {
do.orderPkgRepo(repoPkg, dp, true)
}
}

7
pkg/dep/depPool.go
View file

@ -259,12 +259,17 @@ func (dp *Pool) cacheAURPackages(_pkgs stringset.StringSet, provides bool, split
return nil
}
// Compute dependency lists used in Package dep searching and ordering.
// Order sensitive TOFIX
func ComputeCombinedDepList(pkg *aur.Pkg, noDeps, noCheckDeps bool) [][]string {
combinedDepList := [][]string{pkg.MakeDepends}
combinedDepList := make([][]string, 0, 3)
if !noDeps {
combinedDepList = append(combinedDepList, pkg.Depends)
}
combinedDepList = append(combinedDepList, pkg.MakeDepends)
if !noCheckDeps {
combinedDepList = append(combinedDepList, pkg.CheckDepends)
}