coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-27 21:37:57 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

cmd/ipfs: Fixed bug where handleParseError sets error to nil

Browse Source
This commit is contained in:
Matt Bell 2014-11-12 01:50:39 -08:00 committed by Juan Batiz-Benet
parent ec8be23cbc
commit 78bc748342
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/ipfs2/main.go
View File

@ -92,7 +92,7 @@ func createRequest(args []string) (cmds.Request, *cmds.Command, error) {
// handle parse error (which means the commandline input was wrong,
// e.g. incorrect number of args, or nonexistent subcommand)
if err != nil {
return nil, nil, handleParseError(req, root, cmd, path)
return nil, nil, handleParseError(req, root, cmd, path, err)
}
configPath, err := getConfigRoot(req)
@ -121,11 +121,12 @@ func createRequest(args []string) (cmds.Request, *cmds.Command, error) {
return req, root, nil
}
func handleParseError(req cmds.Request, root *cmds.Command, cmd *cmds.Command, path []string) (err error) {
func handleParseError(req cmds.Request, root *cmds.Command, cmd *cmds.Command, path []string, parseError error) error {
var longHelp, shortHelp bool
if req != nil {
// help and h are defined in the root. We expect them to be bool.
var err error
longHelp, _, err = req.Option("help").Bool()
if err != nil {
return err
@ -141,7 +142,7 @@ func handleParseError(req cmds.Request, root *cmds.Command, cmd *cmds.Command, p
// (this means there was an option or argument error)
if path != nil && len(path) > 0 {
if !longHelp && !shortHelp {
fmt.Printf(errorFormat, err)
fmt.Printf(errorFormat, parseError)
}
}
@ -160,7 +161,7 @@ func handleParseError(req cmds.Request, root *cmds.Command, cmd *cmds.Command, p
if htErr != nil {
fmt.Println(htErr)
}
return err
return parseError
}
func handleHelpOption(req cmds.Request, root *cmds.Command) (helpTextDisplayed bool, err error) {