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/system/connection/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/system/connection/list.go')
| -rw-r--r-- | cmd/podman/system/connection/list.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go index f1f7657ad..2710142a8 100644 --- a/cmd/podman/system/connection/list.go +++ b/cmd/podman/system/connection/list.go @@ -82,7 +82,7 @@ func list(cmd *cobra.Command, _ []string) error { return rows[i].Name < rows[j].Name }) - format := "{{.Name}}\t{{.URI}}\t{{.Identity}}\t{{.Default}}\n" + var format string switch { case report.IsJSON(cmd.Flag("format").Value.String()): buf, err := registry.JSONLibrary().MarshalIndent(rows, "", " ") @@ -90,11 +90,10 @@ func list(cmd *cobra.Command, _ []string) error { fmt.Println(string(buf)) } return err + case cmd.Flags().Changed("format"): + format = report.NormalizeFormat(cmd.Flag("format").Value.String()) default: - if cmd.Flag("format").Changed { - format = cmd.Flag("format").Value.String() - format = report.NormalizeFormat(format) - } + format = "{{.Name}}\t{{.URI}}\t{{.Identity}}\t{{.Default}}\n" } format = report.EnforceRange(format) |