From 536be05e3288d9fe4651b099efecb8d52f2f474e Mon Sep 17 00:00:00 2001 From: David Symonds Date: Wed, 13 Jun 2012 16:24:14 -0400 Subject: [PATCH] [release-branch.go1] flag: include flag name in redefinition panic. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ««« backport 64a249c65d51 flag: include flag name in redefinition panic. R=golang-dev, rsc, r CC=golang-dev https://golang.org/cl/6250043 »»» --- src/pkg/flag/flag.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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) -- 2.50.0