From 0241baba08ba2fd732e46a9634434154d58092e3 Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Fri, 10 Feb 2023 11:14:17 +0100 Subject: pkg/subsystem: extract names after all preprocessing In the previous steps we eliminate some of the extracted subsystems. It helps to have fewer contention while assigning the names. As a result, we need to only rely on emails during parents trasnformations. --- pkg/subsystem/linux/subsystems.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/subsystem/linux/subsystems.go') diff --git a/pkg/subsystem/linux/subsystems.go b/pkg/subsystem/linux/subsystems.go index 8c7d1a673..5ca57a1be 100644 --- a/pkg/subsystem/linux/subsystems.go +++ b/pkg/subsystem/linux/subsystems.go @@ -31,10 +31,6 @@ func listFromRepoInner(root fs.FS, rules *customRules) ([]*entity.Subsystem, err extraRules: rules, } list := ctx.groupByList() - if err := setSubsystemNames(list); err != nil { - return nil, fmt.Errorf("failed to set names: %w", err) - } - ctx.applyExtraRules(list) matrix, err := match.BuildCoincidenceMatrix(root, list, dropPatterns) if err != nil { return nil, err @@ -43,6 +39,10 @@ func listFromRepoInner(root fs.FS, rules *customRules) ([]*entity.Subsystem, err if err != nil { return nil, err } + if err := setSubsystemNames(list); err != nil { + return nil, fmt.Errorf("failed to set names: %w", err) + } + ctx.applyExtraRules(list) // Sort subsystems by name to keep output consistent. sort.Slice(list, func(i, j int) bool { return list[i].Name < list[j].Name }) -- cgit mrf-deployment