Browse Source

*: replace '-' with '--' for long options

A long option should have double dashes (cf. #4595),
so are error messages.
Katsuyuki Tateishi 9 years ago
parent
commit
8b75a33398
2 changed files with 4 additions and 4 deletions
  1. 3 3
      etcdctl/ctlv2/command/role_commands.go
  2. 1 1
      etcdmain/config.go

+ 3 - 3
etcdctl/ctlv2/command/role_commands.go

@@ -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

+ 1 - 1
etcdmain/config.go

@@ -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 {