goinstall: don't wrongly error out with "multiple package names"

Fixes #1215.

R=adg, rsc
CC=golang-dev
https://golang.org/cl/2695042

diff --git a/src/cmd/goinstall/parse.go b/src/cmd/goinstall/parse.go
index 8250456234f659f18c34da108f1a34a29797081a..183929f28264455b1b5c7d05f8912a95d07f8cfe 100644 (file)
--- a/src/cmd/goinstall/parse.go
+++ b/src/cmd/goinstall/parse.go
@@ -56,7 +56,7 @@ func goFiles(dir string, allowMain bool) (files []string, imports map[string]str
                        // do we return pkgName=="main".
                        // A mix of main and another package reverts
                        // to the original (allowMain=false) behaviour.
-                       if allowMain && pkgName == "main" {
+                       if s == "main" || pkgName == "main" {
                                return goFiles(dir, false)
                        }
                        return nil, nil, "", os.ErrorString("multiple package names in " + dir)