From 8e6d098ff82018e12c07ae0a43b923f81becef2a Mon Sep 17 00:00:00 2001 From: jguer Date: Sat, 8 May 2021 00:29:33 +0200 Subject: [PATCH] fix(deps): fix regression on CombinedDepList --- pkg/dep/depOrder.go | 8 ++------ pkg/dep/depPool.go | 7 ++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/dep/depOrder.go b/pkg/dep/depOrder.go index da85c694..1932180f 100644 --- a/pkg/dep/depOrder.go +++ b/pkg/dep/depOrder.go @@ -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) } } diff --git a/pkg/dep/depPool.go b/pkg/dep/depPool.go index 680faedc..3fa7480b 100644 --- a/pkg/dep/depPool.go +++ b/pkg/dep/depPool.go @@ -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) }