diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-02 19:28:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 19:28:48 +0100 |
| commit | 4ff0ba4c8731e3dc1d56010f80468260104f3abc (patch) | |
| tree | 897ede56e699e7f39ad5aa949851bf7fd11ea3c3 /cmd/podman/machine/list.go | |
| parent | ee39281c35e3ceca98c0c51c9cc5d792c56ba533 (diff) | |
| parent | 61792de36ea2ea98f6e3aef3821d1b15beebf9e0 (diff) | |
| download | podman-4ff0ba4c8731e3dc1d56010f80468260104f3abc.tar.gz podman-4ff0ba4c8731e3dc1d56010f80468260104f3abc.tar.bz2 podman-4ff0ba4c8731e3dc1d56010f80468260104f3abc.zip | |
Merge pull request #12455 from jwhonce/issues/10974
Refactor podman image command output
Diffstat (limited to 'cmd/podman/machine/list.go')
| -rw-r--r-- | cmd/podman/machine/list.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go index d569f4db0..774ab4fd0 100644 --- a/cmd/podman/machine/list.go +++ b/cmd/podman/machine/list.go @@ -116,7 +116,15 @@ func outputTemplate(cmd *cobra.Command, responses []*machineReporter) error { "DiskSize": "DISK SIZE", }) - row := report.NormalizeFormat(listFlag.format) + var row string + switch { + case cmd.Flags().Changed("format"): + row = cmd.Flag("format").Value.String() + listFlag.noHeading = !report.HasTable(row) + row = report.NormalizeFormat(row) + default: + row = cmd.Flag("format").Value.String() + } format := report.EnforceRange(row) tmpl, err := report.NewTemplate("list").Parse(format) @@ -130,10 +138,6 @@ func outputTemplate(cmd *cobra.Command, responses []*machineReporter) error { } defer w.Flush() - if cmd.Flags().Changed("format") && !report.HasTable(listFlag.format) { - listFlag.noHeading = true - } - if !listFlag.noHeading { if err := tmpl.Execute(w, headers); err != nil { return errors.Wrapf(err, "failed to write report column headers") |