Merge pull request opencontainers#1332 from sak0/dev

ps: --format value check
kolyshkin · Feb 21, 2017 · 3293874 · 3293874
2 parents 3d7cd1f + 08937e9
commit 3293874
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ps.go b/ps.go
@@ -20,7 +20,7 @@ var psCommand = cli.Command{
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "format, f",
-			Value: "",
+			Value: "table",
 			Usage: `select one of: ` + formatOptions,
 		},
 	},
@@ -38,8 +38,12 @@ var psCommand = cli.Command{
 			return err
 		}
 
-		if context.String("format") == "json" {
+		switch context.String("format") {
+		case "table":
+		case "json":
 			return json.NewEncoder(os.Stdout).Encode(pids)
+		default:
+			return fmt.Errorf("invalid format option")
 		}
 
 		// [1:] is to remove command name, ex: