From 2a9009f4174ccb1767c608bc1e49401f34668325 Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Thu, 26 Apr 2012 13:32:05 -0700 Subject: [PATCH] [release-branch.go1] undo CL 6118059 / 79503f11634a MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Accidentally applied to release branch. ««« original CL description misc/dist: drop repetition in filenames, default to release tag R=golang-dev, rsc CC=golang-dev https://golang.org/cl/6118059 »»» R=golang-dev, rsc CC=golang-dev https://golang.org/cl/6120056 --- misc/dist/bindist.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/misc/dist/bindist.go b/misc/dist/bindist.go index bdbbbb7af7..16193bdc1d 100644 --- a/misc/dist/bindist.go +++ b/misc/dist/bindist.go @@ -30,7 +30,7 @@ import ( ) var ( - tag = flag.String("tag", "release", "mercurial tag to check out") + tag = flag.String("tag", "weekly", "mercurial tag to check out") repo = flag.String("repo", "https://code.google.com/p/go", "repo URL") verbose = flag.Bool("v", false, "verbose output") upload = flag.Bool("upload", true, "upload resulting files to Google Code") @@ -211,20 +211,14 @@ func (b *Build) Do() error { } // Create packages. - base := fmt.Sprintf("%s.%s-%s", version, b.OS, b.Arch) - if !strings.HasPrefix(base, "go") { - base = "go." + base - } + base := fmt.Sprintf("go.%s.%s-%s", version, b.OS, b.Arch) var targs []string switch b.OS { case "linux", "freebsd", "": // build tarball targ := base if b.Source { - targ = fmt.Sprintf("%s.src", version) - if !strings.HasPrefix(targ, "go") { - targ = "go." + targ - } + targ = fmt.Sprintf("go.%s.src", version) } targ += ".tar.gz" err = makeTar(targ, work) -- 2.48.1