Merge pull request #298 from Mashimiao/generate-fix-remove-all-parse

Mrunal Patel · web-flow · commit c91307bbfed9 · 2017-01-10T12:15:58.000-08:00
generate: fix *-remove-all parse bug
diff --git a/cmd/oci-runtime-tool/generate.go b/cmd/oci-runtime-tool/generate.go
@@ -260,11 +260,7 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 		}
 	}
 
-	privileged := false
-	if context.IsSet("privileged") {
-		privileged = context.Bool("privileged")
-	}
-	g.SetupPrivileged(privileged)
+	g.SetupPrivileged(context.Bool("privileged"))
 
 	if context.IsSet("cap-add") {
 		addCaps := context.StringSlice("cap-add")
@@ -482,7 +478,7 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 		}
 	}
 
-	if context.IsSet("rlimits-remove-all") {
+	if context.Bool("rlimits-remove-all") {
 		g.ClearProcessRlimits()
 	}
 
@@ -680,7 +676,7 @@ func addSeccomp(context *cli.Context, g *generate.Generator) error {
 		}
 	}
 
-	if context.IsSet("seccomp-remove-all") {
+	if context.Bool("seccomp-remove-all") {
 		err := g.RemoveAllSeccompRules()
 		if err != nil {
 			return err

Original file line number	Diff line number	Diff line change
`@@ -260,11 +260,7 @@ func setupSpec(g generate.Generator, context cli.Context) error {`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`263`		`- privileged := false`
`264`		`- if context.IsSet("privileged") {`
`265`		`- privileged = context.Bool("privileged")`
`266`		`- }`
`267`		`- g.SetupPrivileged(privileged)`
	`263`	`+ g.SetupPrivileged(context.Bool("privileged"))`
`268`	`264`
`269`	`265`	`if context.IsSet("cap-add") {`
`270`	`266`	`addCaps := context.StringSlice("cap-add")`
`@@ -482,7 +478,7 @@ func setupSpec(g generate.Generator, context cli.Context) error {`
`482`	`478`	`}`
`483`	`479`	`}`
`484`	`480`
`485`		`- if context.IsSet("rlimits-remove-all") {`
	`481`	`+ if context.Bool("rlimits-remove-all") {`
`486`	`482`	`g.ClearProcessRlimits()`
`487`	`483`	`}`
`488`	`484`
`@@ -680,7 +676,7 @@ func addSeccomp(context cli.Context, g generate.Generator) error {`
`680`	`676`	`}`
`681`	`677`	`}`
`682`	`678`
`683`		`- if context.IsSet("seccomp-remove-all") {`
	`679`	`+ if context.Bool("seccomp-remove-all") {`
`684`	`680`	`err := g.RemoveAllSeccompRules()`
`685`	`681`	`if err != nil {`
`686`	`682`	`return err`