misc/dashboard/builder: reinstate 'go get -d' error handling hack

I thought this was redundant since the behavior of 'go get -d' had
changed. I was wrong. Should have tested more thoroughly.

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/6500136

diff --git a/misc/dashboard/builder/main.go b/misc/dashboard/builder/main.go
index 8c6b65caeb60931ebb87861375d643c6ae65abda..5e30115edf12670179959b0b29db57be7258148a 100644 (file)
--- a/misc/dashboard/builder/main.go
+++ b/misc/dashboard/builder/main.go
@@ -360,7 +360,13 @@ func (b *Builder) buildSubrepo(goRoot, pkg, hash string) (string, error) {
                err = fmt.Errorf("go exited with status %d", status)
        }
        if err != nil {
-               return log, err
+               // 'go get -d' will fail for a subrepo because its top-level
+               // directory does not contain a go package. No matter, just
+               // check whether an hg directory exists and proceed.
+               hgDir := filepath.Join(goRoot, "src/pkg", pkg, ".hg")
+               if fi, e := os.Stat(hgDir); e != nil || !fi.IsDir() {
+                       return log, err
+               }
        }
 
        // hg update to the specified hash