浏览代码

Merge pull request #3224 from xiang90/fix_ls

etcdctl: ls takes / as default key arg
Xiang Li 10 年之前
父节点
当前提交
9cbeffc720
共有 1 个文件被更改,包括 3 次插入4 次删除
  1. 3 4
      etcdctl/command/ls_command.go

+ 3 - 4
etcdctl/command/ls_command.go

@@ -15,7 +15,6 @@
 package command
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/codegangsta/cli"
@@ -40,11 +39,11 @@ func NewLsCommand() cli.Command {
 
 // lsCommandFunc executes the "ls" command.
 func lsCommandFunc(c *cli.Context, ki client.KeysAPI) {
-	if len(c.Args()) == 0 {
-		handleError(ExitBadArgs, errors.New("key required"))
+	key := "/"
+	if len(c.Args()) != 0 {
+		key = c.Args()[0]
 	}
 
-	key := c.Args()[0]
 	sort := c.Bool("sort")
 	recursive := c.Bool("recursive")