diff options
| author | 2024-04-19 17:26:27 -0700 | |
|---|---|---|
| committer | 2024-04-24 13:05:55 -0700 | |
| commit | 11209e1255c2bb30d728f26744b9b3774775ecec (patch) | |
| tree | 5489b4a0c0acb3addc9e81400002a86d754542cb | |
| parent | 79cd6899c77afd69328d2e75d76816245731a756 (diff) | |
crunch_flags: keep-sorted lines are not descriptions
Also fix a typo in parsing declare-release-config.
Bug: 328495189
Test: manual, TH
Change-Id: Ibfed4a217275df0dd6bd9c2fb124e0d1f791be08
| -rw-r--r-- | cmd/release_config/crunch_flags/main.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/release_config/crunch_flags/main.go b/cmd/release_config/crunch_flags/main.go index 616674bc5..69abba2a5 100644 --- a/cmd/release_config/crunch_flags/main.go +++ b/cmd/release_config/crunch_flags/main.go @@ -89,7 +89,10 @@ func ProcessBuildFlags(dir string, namespaceMap map[string]string) error { for _, line := range lines { if comment := commentRegexp.FindStringSubmatch(commentRegexp.FindString(line)); comment != nil { // Description is the text from any contiguous series of lines before a `flag()` call. - description += fmt.Sprintf(" %s", strings.TrimSpace(comment[commentRegexp.SubexpIndex("comment")])) + descLine := strings.TrimSpace(comment[commentRegexp.SubexpIndex("comment")]) + if !strings.HasPrefix(descLine, "keep-sorted") { + description += fmt.Sprintf(" %s", descLine) + } continue } matches := declRegexp.FindStringSubmatch(declRegexp.FindString(line)) @@ -218,7 +221,7 @@ func ProcessReleaseConfigMap(dir string, descriptionMap map[string]string) error } else { fmt.Printf("Processing %s\n", path) } - configRegexp, err := regexp.Compile("^..call[[:space:]]+declare-release-config,[[:space:]]+(?<name>[_a-z0-0A-Z]+),[[:space:]]+(?<files>[^,]*)(,[[:space:]]*(?<inherits>.*)|[[:space:]]*)[)]$") + configRegexp, err := regexp.Compile("^..call[[:space:]]+declare-release-config,[[:space:]]+(?<name>[_a-z0-9A-Z]+),[[:space:]]+(?<files>[^,]*)(,[[:space:]]*(?<inherits>.*)|[[:space:]]*)[)]$") if err != nil { return err } |