From: David Symonds <dsymonds@golang.org>
Date: Thu, 24 May 2012 03:42:02 +0000 (+1000)
Subject: flag: include flag name in redefinition panic.
X-Git-Tag: go1.1rc2~3128
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=04f3cf0faaebe59ae24e15531c27d5d885add20e;p=gostls13.git

flag: include flag name in redefinition panic.

R=golang-dev, rsc, r
CC=golang-dev
https://golang.org/cl/6250043
---

diff --git a/src/pkg/flag/flag.go b/src/pkg/flag/flag.go
index f0842a18a2..5444ad141c 100644
--- a/src/pkg/flag/flag.go
+++ b/src/pkg/flag/flag.go
@@ -620,8 +620,9 @@ func (f *FlagSet) Var(value Value, name string, usage string) {
 	flag := &Flag{name, usage, value, value.String()}
 	_, alreadythere := f.formal[name]
 	if alreadythere {
-		fmt.Fprintf(f.out(), "%s flag redefined: %s\n", f.name, name)
-		panic("flag redefinition") // Happens only if flags are declared with identical names
+		msg := fmt.Sprintf("%s flag redefined: %s", f.name, name)
+		fmt.Fprintln(f.out(), msg)
+		panic(msg) // Happens only if flags are declared with identical names
 	}
 	if f.formal == nil {
 		f.formal = make(map[string]*Flag)