Update pkg/controller/registry/resolver/resolver.go

jianzhangbjz · benluddy · web-flow · commit 312095384365 · 2020-09-19T08:42:31.000+08:00
Co-authored-by: Ben Luddy &lt;ben.luddy@gmail.com&gt;
diff --git a/pkg/controller/registry/resolver/resolver.go b/pkg/controller/registry/resolver/resolver.go
@@ -555,11 +555,11 @@ func (r *SatResolver) sortChannel(bundles []*Operator) ([]*Operator, error) {
 	}
 
 	if len(headCandidates) > 1 {
-		errInfo := "found more than one head for channel: "
+		var names []string
 		for _, v := range headCandidates {
-			errInfo = errInfo + fmt.Sprintf("%s.%s-", v.sourceInfo.Channel, v.sourceInfo.Package)
+			names = append(names, v.Identifier())
 		}
-		return nil, fmt.Errorf(fmt.Sprintf("%s, please check the `replaces`/`skipRange` fields of the operator bundles", errInfo))
+		return nil, fmt.Errorf("found multiple channel heads: %v, please check the `replaces`/`skipRange` fields of the operator bundles", names)
 
 	} else if len(headCandidates) < 1 {
 		return nil, fmt.Errorf("head of channel not found")

Original file line number	Diff line number	Diff line change
`@@ -555,11 +555,11 @@ func (r SatResolver) sortChannel(bundles []Operator) ([]*Operator, error) {`
`555`	`555`	`}`
`556`	`556`
`557`	`557`	`if len(headCandidates) > 1 {`
`558`		`- errInfo := "found more than one head for channel: "`
	`558`	`+ var names []string`
`559`	`559`	`for _, v := range headCandidates {`
`560`		`- errInfo = errInfo + fmt.Sprintf("%s.%s-", v.sourceInfo.Channel, v.sourceInfo.Package)`
	`560`	`+ names = append(names, v.Identifier())`
`561`	`561`	`}`
`562`		- return nil, fmt.Errorf(fmt.Sprintf("%s, please check the `replaces`/`skipRange` fields of the operator bundles", errInfo))
	`562`	+ return nil, fmt.Errorf("found multiple channel heads: %v, please check the `replaces`/`skipRange` fields of the operator bundles", names)
`563`	`563`
`564`	`564`	`} else if len(headCandidates) < 1 {`
`565`	`565`	`return nil, fmt.Errorf("head of channel not found")`