don't resolve self.output property if out is specified

gtmanfred · gtmanfred · commit 7496b75e6455 · 2018-03-16T09:34:47.000-06:00
diff --git a/scripts/pepper b/scripts/pepper
@@ -64,7 +64,7 @@ class Pepper(object):
                                         # version >= 2017.7
                                         salt.output.display_output(
                                             {minionid: minionret['ret']},
-                                            self.cli.options.output or minionret.get('out', self.output),
+                                            self.cli.options.output or minionret.get('out', None) or self.output,
                                             opts=self.opts
                                         )
                                     else:

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class Pepper(object):`
`64`	`64`	`# version >= 2017.7`
`65`	`65`	`salt.output.display_output(`
`66`	`66`	`{minionid: minionret['ret']},`
`67`		`- self.cli.options.output or minionret.get('out', self.output),`
	`67`	`+ self.cli.options.output or minionret.get('out', None) or self.output,`
`68`	`68`	`opts=self.opts`
`69`	`69`	`)`
`70`	`70`	`else:`