x/urfave-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #687 from joshuarubin/master

Browse Source 
Don't clobber slices with EnvVar
This commit is contained in:
Jesse Szwedko 2017-11-27 19:55:04 -08:00 committed by GitHub
commit c6af8847eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flag.go
View File

@ -178,7 +178,11 @@ func (f StringSliceFlag) ApplyWithError(set *flag.FlagSet) error {
return fmt.Errorf("could not parse %s as string value for flag %s: %s", envVal, f.Name, err) return fmt.Errorf("could not parse %s as string value for flag %s: %s", envVal, f.Name, err)
} }
} }
f.Value = newVal if f.Value == nil {
f.Value = newVal
} else {
*f.Value = *newVal
}
} }
eachName(f.Name, func(name string) { eachName(f.Name, func(name string) {
@ -235,7 +239,11 @@ func (f IntSliceFlag) ApplyWithError(set *flag.FlagSet) error {
return fmt.Errorf("could not parse %s as int slice value for flag %s: %s", envVal, f.Name, err) return fmt.Errorf("could not parse %s as int slice value for flag %s: %s", envVal, f.Name, err)
} }
} }
f.Value = newVal if f.Value == nil {
f.Value = newVal
} else {
*f.Value = *newVal
}
} }
eachName(f.Name, func(name string) { eachName(f.Name, func(name string) {
@ -292,7 +300,11 @@ func (f Int64SliceFlag) ApplyWithError(set *flag.FlagSet) error {
return fmt.Errorf("could not parse %s as int64 slice value for flag %s: %s", envVal, f.Name, err) return fmt.Errorf("could not parse %s as int64 slice value for flag %s: %s", envVal, f.Name, err)
} }
} }
f.Value = newVal if f.Value == nil {
f.Value = newVal
} else {
*f.Value = *newVal
}
} }
eachName(f.Name, func(name string) { eachName(f.Name, func(name string) {