summaryrefslogtreecommitdiff
path: root/src/cmd/dist
diff options
context:
space:
mode:
authorAndrew Gerrand <adg@golang.org>2014-05-01 12:13:32 -0400
committerAndrew Gerrand <adg@golang.org>2014-05-01 12:13:32 -0400
commit294e67cd717d7e1b4b849bd30e6208965c0ddfc2 (patch)
tree05a5352bd6bb6dc67616fc0db923c06393ec99d3 /src/cmd/dist
parent1aeb633a4e41b6b76f7d4a18679f92d057c49a9f (diff)
downloadgo-294e67cd717d7e1b4b849bd30e6208965c0ddfc2.tar.gz
cmd/dist: permit go* tag in main branch when it includes "beta"
This change allows us to give an hg tag such as "go1.3beta1" to revisions in the main branch without breaking the build. This is helpful for community members who want to build the beta from source. LGTM=rsc R=rsc CC=golang-codereviews https://codereview.appspot.com/90190044
Diffstat (limited to 'src/cmd/dist')
-rw-r--r--src/cmd/dist/build.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index 4ffc78dbc..5d9062882 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -444,7 +444,7 @@ setup(void)
}
// For release, make sure excluded things are excluded.
- if(hasprefix(goversion, "release.") || hasprefix(goversion, "go")) {
+ if(hasprefix(goversion, "release.") || (hasprefix(goversion, "go") && !contains(goversion, "beta"))) {
for(i=0; i<nelem(unreleased); i++)
if(isdir(bpathf(&b, "%s/%s", goroot, unreleased[i])))
fatal("%s should not exist in release build", bstr(&b));