Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 3 additions & 14 deletions pkg/sat/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -319,20 +319,9 @@ func (loader *Loader) explodeSamePackageConflicts(pkgVar *Var) bf.Formula {
}

func (loader *Loader) explodeSingleRequires(entry api.Entry, provides []*Var) (accepts []*Var, err error) {
provPerPkg := map[VarContext][]*Var{}
for _, prov := range provides {
provPerPkg[prov.Context] = append(provPerPkg[prov.Context], prov)
}

for _, pkgProv := range provPerPkg {
acceptsFromPkg, err := compareRequires(entry, pkgProv)
if err != nil {
return nil, err
}
if len(acceptsFromPkg) > 0 {
// just pick one to avoid excluding each other
accepts = append(accepts, acceptsFromPkg[0])
}
accepts, err = compareRequires(entry, provides)
if err != nil {
return nil, err
}

if len(accepts) == 0 {
Expand Down
Loading