diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-27 14:44:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-27 14:44:59 +0100 |
| commit | 55922e36707347d5db7182cda3d820e4bd85968d (patch) | |
| tree | 5dd5aa1f2d1ac038d28ad6261640436c1e461462 /cmd | |
| parent | c759c3f78dcbbf5dec462a863ad25cd41a1707b7 (diff) | |
| parent | 25860df8785c6d51ced8320ec6d0d9620171bdb9 (diff) | |
| download | podman-55922e36707347d5db7182cda3d820e4bd85968d.tar.gz podman-55922e36707347d5db7182cda3d820e4bd85968d.tar.bz2 podman-55922e36707347d5db7182cda3d820e4bd85968d.zip | |
Merge pull request #4751 from mheon/quiet_template_noconflict
The --quiet flag does not conflict with templates in ps
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/ps.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go index 9fad0ea65..4ac779430 100644 --- a/cmd/podman/ps.go +++ b/cmd/podman/ps.go @@ -204,11 +204,15 @@ func checkFlagsPassed(c *cliconfig.PsValues) error { if c.Last >= 0 && c.Latest { return errors.Errorf("last and latest are mutually exclusive") } - // Quiet conflicts with size, namespace, and format with a Go template + // Quiet conflicts with size and namespace and is overridden by a Go + // template. if c.Quiet { - if c.Size || c.Namespace || (c.Flag("format").Changed && - c.Format != formats.JSONString) { - return errors.Errorf("quiet conflicts with size, namespace, and format with go template") + if c.Size || c.Namespace { + return errors.Errorf("quiet conflicts with size and namespace") + } + if c.Flag("format").Changed && c.Format != formats.JSONString { + // Quiet is overridden by Go template output. + c.Quiet = false } } // Size and namespace conflict with each other |