improve deprecation message
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
This commit is contained in:
parent
02be9306bc
commit
f7fe084946
2 changed files with 15 additions and 3 deletions
|
@ -13,7 +13,8 @@ var (
|
|||
|
||||
func init() {
|
||||
flag.Bool([]string{"#hp", "#-halp"}, false, "display the halp")
|
||||
flag.BoolVar(&b, []string{"b"}, false, "a simple bool")
|
||||
flag.BoolVar(&b, []string{"b", "#bal", "#bol", "-bal"}, false, "a simple bool")
|
||||
flag.BoolVar(&b, []string{"g", "#gil"}, false, "a simple bool")
|
||||
flag.BoolVar(&b2, []string{"#-bool"}, false, "a simple bool")
|
||||
flag.IntVar(&i, []string{"-integer", "-number"}, -1, "a simple integer")
|
||||
flag.StringVar(&str, []string{"s", "#hidden", "-string"}, "", "a simple string") //-s -hidden and --string will work, but -hidden won't be in the usage
|
||||
|
|
|
@ -820,9 +820,20 @@ func (f *FlagSet) parseOne() (bool, string, error) {
|
|||
f.actual = make(map[string]*Flag)
|
||||
}
|
||||
f.actual[name] = flag
|
||||
for _, n := range flag.Names {
|
||||
for i, n := range flag.Names {
|
||||
if n == fmt.Sprintf("#%s", name) {
|
||||
fmt.Fprintf(f.out(), "Warning: '-%s' is deprecated, it will be removed soon. See usage.\n", name)
|
||||
replacement := ""
|
||||
for j := i; j < len(flag.Names); j++ {
|
||||
if flag.Names[j][0] != '#' {
|
||||
replacement = flag.Names[j]
|
||||
break
|
||||
}
|
||||
}
|
||||
if replacement != "" {
|
||||
fmt.Fprintf(f.out(), "Warning: '-%s' is deprecated, it will be replaced by '-%s' soon. See usage.\n", name, replacement)
|
||||
} else {
|
||||
fmt.Fprintf(f.out(), "Warning: '-%s' is deprecated, it will be removed soon. See usage.\n", name)
|
||||
}
|
||||
}
|
||||
}
|
||||
return true, "", nil
|
||||
|
|
Loading…
Reference in a new issue