diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-25 11:08:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-25 11:08:43 -0400 |
| commit | dec14194f07dfc7b43695ea877c398df6d26f327 (patch) | |
| tree | ee3adb5303604987a12fe17b1709415affe2e262 /cmd/podman/system/connection | |
| parent | f8a793a72d0b3ed52ced0e0e765935280c48c786 (diff) | |
| parent | 9f4afa1ea229cebc45e2bc8525881fe74d79cd1d (diff) | |
| download | podman-dec14194f07dfc7b43695ea877c398df6d26f327.tar.gz podman-dec14194f07dfc7b43695ea877c398df6d26f327.tar.bz2 podman-dec14194f07dfc7b43695ea877c398df6d26f327.zip | |
Merge pull request #10778 from mheon/backports_322
Backports for v3.2.2
Diffstat (limited to 'cmd/podman/system/connection')
| -rw-r--r-- | cmd/podman/system/connection/list.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go index fe7026ae3..15f007920 100644 --- a/cmd/podman/system/connection/list.go +++ b/cmd/podman/system/connection/list.go @@ -2,11 +2,10 @@ package connection import ( "os" - "text/tabwriter" - "text/template" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" + "github.com/containers/common/pkg/report" "github.com/containers/podman/v3/cmd/podman/registry" "github.com/containers/podman/v3/cmd/podman/system" "github.com/containers/podman/v3/cmd/podman/validate" @@ -76,13 +75,16 @@ func list(_ *cobra.Command, _ []string) error { } // TODO: Allow user to override format - format := "{{range . }}{{.Name}}\t{{.Identity}}\t{{.URI}}\n{{end}}" - tmpl, err := template.New("connection").Parse(format) + format := "{{range . }}{{.Name}}\t{{.Identity}}\t{{.URI}}\n{{end -}}" + tmpl, err := report.NewTemplate("list").Parse(format) if err != nil { return err } - w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0) + w, err := report.NewWriterDefault(os.Stdout) + if err != nil { + return err + } defer w.Flush() _ = tmpl.Execute(w, hdrs) |