From: Fazlul Shahriar <fshahriar@gmail.com>
Date: Mon, 25 Oct 2010 02:13:00 +0000 (+1100)
Subject: goinstall: don't wrongly error out with "multiple package names"
X-Git-Tag: weekly.2010-10-27~35
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ee065332dda70b12be42a52b12c1867529d62cec;p=gostls13.git

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 8250456234..183929f282 100644
--- 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)