qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-11 23:50:22 -07:00
Code Releases Activity

cmd/dist: prevent race on VERSION creation

Browse Source 
Commands such as "dist version > VERSION" will cause
the shell to create an empty VERSION file and set dist's
stdout to its fd. dist in turn looks at VERSION and uses
its content if available, which is empty at this point.

Fix that by ignoring VERSION if it's empty.

Also prevent cmdversion from running findgoversion a
second time. It was already loaded by init.

R=adg, gustavo, rsc
CC=golang-dev
https://golang.org/cl/5639044
This commit is contained in:
Gustavo Niemeyer 2012-02-07 00:38:15 -02:00
parent 4151183e94
commit c2fe6634db
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cmd/dist/build.c vendored
View File

@ -179,7 +179,12 @@ findgoversion(void)
if(isfile(bstr(&path))) { if(isfile(bstr(&path))) {
readfile(&b, bstr(&path)); readfile(&b, bstr(&path));
chomp(&b); chomp(&b);
goto done; // Commands such as "dist version > VERSION" will cause
// the shell to create an empty VERSION file and set dist's
// stdout to its fd. dist in turn looks at VERSION and uses
// its content if available, which is empty at this point.
if(b.len > 0)
goto done;
} }
// The $GOROOT/VERSION.cache file is a cache to avoid invoking // The $GOROOT/VERSION.cache file is a cache to avoid invoking
@ -1370,5 +1375,5 @@ cmdversion(int argc, char **argv)
if(argc > 0) if(argc > 0)
usage(); usage();
xprintf("%s\n", findgoversion()); xprintf("%s\n", goversion);
} }