fixup! rhel: have repository scanner consult dnf

hdonnay · hdonnay · commit 08c2d5057b9e · 2025-03-25T14:44:07.000-05:00
Signed-off-by: Hank Donnay <hdonnay@redhat.com> See-also: https://issues.redhat.com/browse/KONFLUX-6218
diff --git a/rhel/repositoryscanner.go b/rhel/repositoryscanner.go
@@ -221,17 +221,22 @@ func (r *RepositoryScanner) Scan(ctx context.Context, l *claircore.Layer) ([]*cl
 	}
 
 	pairs := func(yield func(string, string) bool) {
+		var found bool
 		for _, repoid := range repoids {
 			cpes, ok := cm.GetOne(ctx, repoid)
 			if !ok {
 				continue
 			}
+			found = true
 			for _, cpe := range cpes {
 				if !yield(repoid, cpe) {
 					return
 				}
 			}
 		}
+		if found {
+			return
+		}
 
 		if r.apiFetcher != nil {
 			// Embedded content-sets are unavailable in very old images.

Original file line number	Diff line number	Diff line change
`@@ -221,17 +221,22 @@ func (r RepositoryScanner) Scan(ctx context.Context, l claircore.Layer) ([]*cl`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`pairs := func(yield func(string, string) bool) {`
	`224`	`+ var found bool`
`224`	`225`	`for _, repoid := range repoids {`
`225`	`226`	`cpes, ok := cm.GetOne(ctx, repoid)`
`226`	`227`	`if !ok {`
`227`	`228`	`continue`
`228`	`229`	`}`
	`230`	`+ found = true`
`229`	`231`	`for _, cpe := range cpes {`
`230`	`232`	`if !yield(repoid, cpe) {`
`231`	`233`	`return`
`232`	`234`	`}`
`233`	`235`	`}`
`234`	`236`	`}`
	`237`	`+ if found {`
	`238`	`+ return`
	`239`	`+ }`
`235`	`240`
`236`	`241`	`if r.apiFetcher != nil {`
`237`	`242`	`// Embedded content-sets are unavailable in very old images.`