From e06651aa044e979a2b143113a0c0cf5e5e8cfc4b Mon Sep 17 00:00:00 2001 From: Adam Szady <7527999+aszady@users.noreply.github.com> Date: Fri, 23 Jan 2026 15:40:06 +0100 Subject: [PATCH] Remove redundant `explodeSingleRequires` argument The `Loader` already has the needed data to derive the second argument. Decreasing risk of errors and making future changes easier. --- pkg/sat/loader.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/sat/loader.go b/pkg/sat/loader.go index cb031aa3..7a9ae332 100644 --- a/pkg/sat/loader.go +++ b/pkg/sat/loader.go @@ -247,7 +247,7 @@ func (loader *Loader) explodePackageRequires(pkgVar *Var) bf.Formula { var requirements [][]*Var ok := true for _, req := range pkgVar.Package.Format.Requires.Entries { - satisfies, err := loader.explodeSingleRequires(req, loader.provides[req.Name]) + satisfies, err := loader.explodeSingleRequires(req) if err != nil { logrus.Warnf("Package %s requires %s, but only got %+v", pkgVar.Package, req, loader.provides[req.Name]) ok = false @@ -279,7 +279,7 @@ func (loader *Loader) explodePackageRequires(pkgVar *Var) bf.Formula { func (loader *Loader) explodePackageConflicts(pkgVar *Var) bf.Formula { conflictingVars := []bf.Formula{} for _, req := range pkgVar.Package.Format.Conflicts.Entries { - conflicts, err := loader.explodeSingleRequires(req, loader.provides[req.Name]) + conflicts, err := loader.explodeSingleRequires(req) if err != nil { // if a conflicting resource does not exist, we don't care continue @@ -318,8 +318,8 @@ func (loader *Loader) explodeSamePackageConflicts(pkgVar *Var) bf.Formula { return bf.Or(conflictingVars...) } -func (loader *Loader) explodeSingleRequires(entry api.Entry, provides []*Var) (accepts []*Var, err error) { - accepts, err = compareRequires(entry, provides) +func (loader *Loader) explodeSingleRequires(entry api.Entry) (accepts []*Var, err error) { + accepts, err = compareRequires(entry, loader.provides[entry.Name]) if err != nil { return nil, err }