Wrapper fixes
This commit is contained in:
@@ -1440,7 +1440,7 @@ func collectExistingFeatKeys(featDir string) (map[string]struct{}, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if rawEntries, ok := obj["entries"].(map[string]any); ok {
|
if rawEntries, ok := obj["entries"].(map[string]any); ok {
|
||||||
for key := range rawEntries {
|
for _, key := range sortedKeys(rawEntries) {
|
||||||
if key != "" {
|
if key != "" {
|
||||||
keys[key] = struct{}{}
|
keys[key] = struct{}{}
|
||||||
}
|
}
|
||||||
@@ -1512,7 +1512,8 @@ func collectRetiredFeatKeys(featDir string) (map[string]struct{}, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if rawEntries, ok := obj["entries"].(map[string]any); ok {
|
if rawEntries, ok := obj["entries"].(map[string]any); ok {
|
||||||
for key, rawEntry := range rawEntries {
|
for _, key := range sortedKeys(rawEntries) {
|
||||||
|
rawEntry := rawEntries[key]
|
||||||
entry, ok := rawEntry.(map[string]any)
|
entry, ok := rawEntry.(map[string]any)
|
||||||
if !ok || key == "" {
|
if !ok || key == "" {
|
||||||
continue
|
continue
|
||||||
@@ -2647,7 +2648,7 @@ func resolveAffinitySkillKey(skillRows map[string]map[string]any, skillKey strin
|
|||||||
return skillKey
|
return skillKey
|
||||||
}
|
}
|
||||||
target := normalizeKeyIdentity(strings.TrimPrefix(skillKey, "skills:"))
|
target := normalizeKeyIdentity(strings.TrimPrefix(skillKey, "skills:"))
|
||||||
for key := range skillRows {
|
for _, key := range sortedStringMapKeys(skillRows) {
|
||||||
if normalizeKeyIdentity(strings.TrimPrefix(key, "skills:")) == target {
|
if normalizeKeyIdentity(strings.TrimPrefix(key, "skills:")) == target {
|
||||||
return key
|
return key
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user