From 3255bb02d1b1835675a7710766e5af6059ceb921 Mon Sep 17 00:00:00 2001
From: Matt Bell <mappum@gmail.com>
Date: Sat, 8 Nov 2014 03:18:00 -0800
Subject: [PATCH] commands/cli: Output command path in Parse
---
commands/cli/parse.go | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/commands/cli/parse.go b/commands/cli/parse.go
index 8972fa96d..e9e91fbfe 100644
--- a/commands/cli/parse.go
+++ b/commands/cli/parse.go
@@ -11,7 +11,7 @@ import (
// Parse parses the input commandline string (cmd, flags, and args).
// returns the corresponding command Request object.
-func Parse(input []string, roots ...*cmds.Command) (cmds.Request, *cmds.Command, *cmds.Command, error) {
+func Parse(input []string, roots ...*cmds.Command) (cmds.Request, *cmds.Command, *cmds.Command, []string, error) {
var root, cmd *cmds.Command
var path, stringArgs []string
var opts map[string]interface{}
@@ -22,7 +22,7 @@ func Parse(input []string, roots ...*cmds.Command) (cmds.Request, *cmds.Command,
p, i, c := parsePath(input, r)
o, s, err := parseOptions(i)
if err != nil {
- return nil, root, c, err
+ return nil, root, c, p, err
}
length := len(p)
@@ -37,22 +37,22 @@ func Parse(input []string, roots ...*cmds.Command) (cmds.Request, *cmds.Command,
}
if maxLength == 0 {
- return nil, root, nil, errors.New("Not a valid subcommand")
+ return nil, root, nil, path, errors.New("Not a valid subcommand")
}
args, err := parseArgs(stringArgs, cmd)
if err != nil {
- return nil, root, cmd, err
+ return nil, root, cmd, path, err
}
req := cmds.NewRequest(path, opts, args, cmd)
err = cmd.CheckArguments(req)
if err != nil {
- return nil, root, cmd, err
+ return req, root, cmd, path, err
}
- return req, root, cmd, nil
+ return req, root, cmd, path, nil
}
// parsePath separates the command path and the opts and args from a command string
--
GitLab