From: Rob Pike <r@golang.org>
Date: Fri, 21 Sep 2012 19:54:17 +0000 (+1000)
Subject: [release-branch.go1] flag: fix bug in handling of booleans on error
X-Git-Tag: go1.0.3~133
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=37401b00bf7bc36a16cb33a2163508cb18b24f62;p=gostls13.git

[release-branch.go1] flag: fix bug in handling of booleans on error

««« backport a36c0344826a
flag: fix bug in handling of booleans on error
Fixes #3869.

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/6448072

»»»
---

diff --git a/src/pkg/flag/flag.go b/src/pkg/flag/flag.go
index 3116dafb5a..bbabd88c8c 100644
--- a/src/pkg/flag/flag.go
+++ b/src/pkg/flag/flag.go
@@ -707,7 +707,7 @@ func (f *FlagSet) parseOne() (bool, error) {
 	if fv, ok := flag.Value.(*boolValue); ok { // special case: doesn't need an arg
 		if has_value {
 			if err := fv.Set(value); err != nil {
-				f.failf("invalid boolean value %q for  -%s: %v", value, name, err)
+				return false, f.failf("invalid boolean value %q for  -%s: %v", value, name, err)
 			}
 		} else {
 			fv.Set("true")