diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-06 13:09:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-06 13:09:23 +0000 |
| commit | 188f1989faa7de371558cb5466132edcfe62eda3 (patch) | |
| tree | 7d19bf165a8591d601c4461daae7e68618aebff5 /cmd/podman/system/info.go | |
| parent | 18e31935ab068567178d50e0317ab2f3ea54926e (diff) | |
| parent | 7d22cc88ef382033c59d09570d1525189e104eae (diff) | |
| download | podman-188f1989faa7de371558cb5466132edcfe62eda3.tar.gz podman-188f1989faa7de371558cb5466132edcfe62eda3.tar.bz2 podman-188f1989faa7de371558cb5466132edcfe62eda3.zip | |
Merge pull request #12487 from jwhonce/issues/10974-2
Refactor podman system to report.Formatter
Diffstat (limited to 'cmd/podman/system/info.go')
| -rw-r--r-- | cmd/podman/system/info.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go index c3f543e6a..c323ee276 100644 --- a/cmd/podman/system/info.go +++ b/cmd/podman/system/info.go @@ -3,6 +3,7 @@ package system import ( "fmt" "os" + "text/template" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" @@ -84,7 +85,10 @@ func info(cmd *cobra.Command, args []string) error { } fmt.Println(string(b)) case cmd.Flags().Changed("format"): - tmpl, err := report.NewTemplate("info").Parse(inFormat) + // Cannot use report.New() as it enforces {{range .}} for OriginUser templates + tmpl := template.New(cmd.Name()).Funcs(template.FuncMap(report.DefaultFuncs)) + inFormat = report.NormalizeFormat(inFormat) + tmpl, err := tmpl.Parse(inFormat) if err != nil { return err } |