X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/00900388c9704a4fe76a459934a2b9f73a3cec1a..37d9f94b06ff367a3514b58ec6f0e4d4d0116030:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 268aba7516..880799b348 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -72,15 +72,8 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	loader.SetupFlags(flags)
 	versionFlag := flags.Bool("version", false, "Write version information to stdout and exit 0")
 	pprofAddr := flags.String("pprof", "", "Serve Go profile data at `[addr]:port`")
-	err = flags.Parse(args)
-	if err == flag.ErrHelp {
-		err = nil
-		return 0
-	} else if err != nil {
-		return 2
-	} else if flags.NArg() != 0 {
-		err = fmt.Errorf("unrecognized command line arguments: %v", flags.Args())
-		return 2
+	if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok {
+		return code
 	} else if *versionFlag {
 		return cmd.Version.RunCommand(prog, args, stdin, stdout, stderr)
 	}