return empty, err
}
{
- // Don't leak internal group order which is confusing without
- // knowing the implementation details.
+ // Don't leak internal group priority which is confusing
+ // without knowing the implementation details.
groupsSorted := make([]string, len(groups))
copy(groupsSorted, groups)
sort.Strings(groupsSorted)
b := priorities[j]
return groupPriority[a] < groupPriority[b]
})
- s.logVerbosef("host group priorities (desc. order): %v",
+ s.logVerbosef("host group priorities (desc. priority): %v",
strings.Join(priorities, " "))
}
// Early entries have higher priorities
groupPriority := make(map[string]int)
- for i, x := range s.config.GroupOrder {
+ for i, x := range s.config.GroupPriority {
groupPriority[x] = math.MinInt32 + i + 1
}
// Host itself always has highest priority
}
return fmt.Errorf("groups %s and %s both provide file %q\n"+
- "Use 'group_order' in config.yaml to declare preference",
+ "Use 'group_priority' in config.yaml to declare preference",
group, old.OrigGroup, path)
}
const sep = string(filepath.Separator)
- // Remove invalid paths which can result from group_order overriding
- // paths from another group (e.g. "/foo" as file from one group and
- // "/foo/bar" from another).
+ // Remove invalid paths which can result from group_priority
+ // overriding paths from another group (e.g. "/foo" as file from one
+ // group and "/foo/bar" from another).
var last *safcm.File
for _, x := range paths {
file := files[x]