diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-30 17:00:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 17:00:22 +0100 |
| commit | e632f3f2588d00184a50a7328d54a31ccf973708 (patch) | |
| tree | e7fb78c6ae6c81a77aac78015e7a0421de6d552c /cmd/podman/pods/ps.go | |
| parent | 6b5a94cf2831df0633cc03a28f432177c0ee1d7b (diff) | |
| parent | d60a0ddcc1784b2dd807cc8e4d4f3deb0c074171 (diff) | |
| download | podman-e632f3f2588d00184a50a7328d54a31ccf973708.tar.gz podman-e632f3f2588d00184a50a7328d54a31ccf973708.tar.bz2 podman-e632f3f2588d00184a50a7328d54a31ccf973708.zip | |
Merge pull request #8187 from jwhonce/wip/table
Restore --format table header support
Diffstat (limited to 'cmd/podman/pods/ps.go')
| -rw-r--r-- | cmd/podman/pods/ps.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index 688108c1a..40fc71780 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -11,6 +11,7 @@ import ( "time" "github.com/containers/common/pkg/report" + "github.com/containers/podman/v2/cmd/podman/parse" "github.com/containers/podman/v2/cmd/podman/registry" "github.com/containers/podman/v2/cmd/podman/validate" "github.com/containers/podman/v2/pkg/domain/entities" @@ -113,20 +114,22 @@ func pods(cmd *cobra.Command, _ []string) error { "Created": "CREATED", "InfraID": "INFRA ID", }) + renderHeaders := true row := podPsFormat() if cmd.Flags().Changed("format") { + renderHeaders = parse.HasTable(psInput.Format) row = report.NormalizeFormat(psInput.Format) } - row = "{{range . }}" + row + "{{end}}" + format := parse.EnforceRange(row) - tmpl, err := template.New("listPods").Parse(row) + tmpl, err := template.New("listPods").Parse(format) if err != nil { return err } w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0) defer w.Flush() - if !psInput.Quiet && !cmd.Flag("format").Changed { + if renderHeaders { if err := tmpl.Execute(w, headers); err != nil { return err } |