StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't panic when a map is included twice" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-15 00:20:01 +00:00
committed by Gerrit Code Review
parent ef71f7ad8c 05d59c5905
commit 0bcdc1f417
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/release_config/release_config_lib/release_configs.go
View File

@@ -439,7 +439,8 @@ func ReadReleaseConfigMaps(releaseConfigMapPaths StringList, targetRelease strin
configs := ReleaseConfigsFactory() configs := ReleaseConfigsFactory()
mapsRead := make(map[string]bool) mapsRead := make(map[string]bool)
for idx, releaseConfigMapPath := range releaseConfigMapPaths { var idx int
for _, releaseConfigMapPath := range releaseConfigMapPaths {
// Maintain an ordered list of release config directories. // Maintain an ordered list of release config directories.
configDir := filepath.Dir(releaseConfigMapPath) configDir := filepath.Dir(releaseConfigMapPath)
if mapsRead[configDir] { if mapsRead[configDir] {
@@ -454,6 +455,7 @@ func ReadReleaseConfigMaps(releaseConfigMapPaths StringList, targetRelease strin
if err != nil { if err != nil {
return nil, err return nil, err
} }
idx += 1
} }
// Now that we have all of the release config maps, can meld them and generate the artifacts. // Now that we have all of the release config maps, can meld them and generate the artifacts.