fix(context): copy StringSlice Flag correctly

This commit is contained in:
Yicheng Qin
2014-03-18 19:26:57 -07:00
parent 4097aa09fe
commit ce13660ae0
2 changed files with 29 additions and 1 deletions

View File

@@ -197,6 +197,7 @@ func lookupBool(name string, set *flag.FlagSet) bool {
return false
}
func lookupBoolT(name string, set *flag.FlagSet) bool {
f := set.Lookup(name)
if f != nil {
@@ -210,6 +211,14 @@ func lookupBoolT(name string, set *flag.FlagSet) bool {
return false
}
func copyFlag(name string, ff *flag.Flag, set *flag.FlagSet) {
switch ff.Value.(type) {
case *StringSlice:
default:
set.Set(name, ff.Value.String())
}
}
func normalizeFlags(flags []Flag, set *flag.FlagSet) error {
visited := make(map[string]bool)
set.Visit(func(f *flag.Flag) {
@@ -235,7 +244,9 @@ func normalizeFlags(flags []Flag, set *flag.FlagSet) error {
}
for _, name := range parts {
name = strings.Trim(name, " ")
set.Set(name, ff.Value.String())
if !visited[name] {
copyFlag(name, ff, set)
}
}
}
return nil