vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5566 from ktateish/fix-single-dash 

*: replace '-' with '--' for long options
release-3.0
Gyu-Ho Lee 2016-06-05 21:38:29 -07:00
parent 3c2a47ea64 8b75a33398
commit c63eaf45f9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etcdctl/ctlv2/command/role_commands.go
View File

@ -154,11 +154,11 @@ func actionRoleRevoke(c *cli.Context) {
func roleGrantRevoke(c *cli.Context, grant bool) {
path := c.String("path")
if path == "" {
fmt.Fprintln(os.Stderr, "No path specified; please use `-path`")
fmt.Fprintln(os.Stderr, "No path specified; please use `--path`")
os.Exit(1)
}
if pathutil.CanonicalURLPath(path) != path {
fmt.Fprintf(os.Stderr, "Not canonical path; please use `-path=%s`\n", pathutil.CanonicalURLPath(path))
fmt.Fprintf(os.Stderr, "Not canonical path; please use `--path=%s`\n", pathutil.CanonicalURLPath(path))
os.Exit(1)
}
@ -172,7 +172,7 @@ func roleGrantRevoke(c *cli.Context, grant bool) {
}
}
if permcount != 1 {
fmt.Fprintln(os.Stderr, "Please specify exactly one of -read, -write or -readwrite")
fmt.Fprintln(os.Stderr, "Please specify exactly one of --read, --write or --readwrite")
os.Exit(1)
}
var permType client.PermissionType

2
etcdmain/config.go
View File

@ -75,7 +75,7 @@ var (
ErrConflictBootstrapFlags = fmt.Errorf("multiple discovery or bootstrap flags are set. " +
"Choose one of \"initial-cluster\", \"discovery\" or \"discovery-srv\"")
errUnsetAdvertiseClientURLsFlag = fmt.Errorf("-advertise-client-urls is required when --listen-client-urls is set explicitly")
errUnsetAdvertiseClientURLsFlag = fmt.Errorf("--advertise-client-urls is required when --listen-client-urls is set explicitly")
)
type config struct {