homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix upgrade flaeg

Browse source
This commit is contained in:
Michael 2018-12-03 10:34:04 +01:00 • committed by Traefiker Bot
parent a0b9c0d007
commit d63636243c
4 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
vendor/github.com/containous/flaeg/flaeg.go generated vendored
View file

@ -434,6 +434,11 @@ func LoadWithCommand(cmd *Command, cmdArgs []string, customParsers map[reflect.T
// PrintHelpWithCommand generates and prints command line help for a Command
func PrintHelpWithCommand(flagMap map[string]reflect.StructField, defaultValMap map[string]reflect.Value, parsers map[reflect.Type]parse.Parser, cmd *Command, subCmd []*Command) error {
// Hide command from help
if cmd != nil && cmd.HideHelp {
return fmt.Errorf("command %s not found", cmd.Name)
}
// Define a templates
// Using POSXE STD : http://pubs.opengroup.org/onlinepubs/9699919799/
const helper = `{{if .ProgDescription}}{{.ProgDescription}}
@ -457,7 +462,7 @@ Flags:
SubCommands map[string]string
}
tempStruct := TempStruct{}
if cmd != nil && !cmd.HideHelp {
if cmd != nil {
tempStruct.ProgName = cmd.Name
tempStruct.ProgDescription = cmd.Description
tempStruct.SubCommands = map[string]string{}
@ -582,7 +587,10 @@ func PrintErrorWithCommand(err error, flagMap map[string]reflect.StructField, de
fmt.Printf("Error here : %s\n", err)
}
PrintHelpWithCommand(flagMap, defaultValMap, parsers, cmd, subCmd)
if errHelp := PrintHelpWithCommand(flagMap, defaultValMap, parsers, cmd, subCmd); errHelp != nil {
return errHelp
}
return err
}
@ -661,7 +669,7 @@ func (f *Flaeg) findCommandWithCommandArgs() (*Command, []string, error) {
commandName, f.commandArgs = splitArgs(f.args)
if len(commandName) > 0 {
for _, command := range f.commands {
if commandName == command.Name && !command.HideHelp {
if commandName == command.Name {
f.calledCommand = command
return f.calledCommand, f.commandArgs, nil
}

4
vendor/github.com/containous/flaeg/parse/parse.go generated vendored
View file

@ -172,7 +172,7 @@ type Duration time.Duration
// Set sets the duration from the given string value.
func (d *Duration) Set(s string) error {
if v, err := strconv.Atoi(s); err == nil {
if v, err := strconv.ParseInt(s, 10, 64); err == nil {
*d = Duration(time.Duration(v) * time.Second)
return nil
}
@ -211,7 +211,7 @@ func (d *Duration) MarshalJSON() ([]byte, error) {
// UnmarshalJSON deserializes the given text into a duration value.
func (d *Duration) UnmarshalJSON(text []byte) error {
if v, err := strconv.Atoi(string(text)); err == nil {
if v, err := strconv.ParseInt(string(text), 10, 64); err == nil {
*d = Duration(time.Duration(v))
return nil
}