Skip to content

Remove redundant explodeSingleRequires argument #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kellyma2 merged 1 commit into from
Jan 28, 2026
Merged

Remove redundant explodeSingleRequires argument #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/sat/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down
Loading