From 1ddbfeedae55844a3b3a671ef66a2fe17bfd81b7 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 13 Jun 2012 16:24:56 -0400 Subject: [PATCH] [release-branch.go1] cmd/api: handle empty API file, ignore -next in release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ««« backport 8e7ad2db0833 cmd/api: handle empty API file, ignore -next in release R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/6298063 »»» --- src/cmd/api/goapi.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go index 3beb7d4b714..ad1c6bb8cae 100644 --- a/src/cmd/api/goapi.go +++ b/src/cmd/api/goapi.go @@ -28,6 +28,7 @@ import ( "os/exec" "path" "path/filepath" + "runtime" "sort" "strconv" "strings" @@ -99,6 +100,13 @@ func setContexts() { func main() { flag.Parse() + if !strings.Contains(runtime.Version(), "weekly") { + if *nextFile != "" { + fmt.Printf("Go version is %q, ignoring -next %s\n", runtime.Version(), *nextFile) + *nextFile = "" + } + } + if *forceCtx != "" { setContexts() } @@ -235,7 +243,11 @@ func fileFeatures(filename string) []string { if err != nil { log.Fatalf("Error reading file %s: %v", filename, err) } - return strings.Split(strings.TrimSpace(string(bs)), "\n") + text := strings.TrimSpace(string(bs)) + if text == "" { + return nil + } + return strings.Split(text, "\n") } // pkgSymbol represents a symbol in a package