From 7d22cc88ef382033c59d09570d1525189e104eae Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Thu, 2 Dec 2021 11:05:03 -0700 Subject: Refactor podman system to report.Formatter [NO NEW TESTS NEEDED] Support better compatibility output for podman system commands * Format and content of output from podman version changed to be more compatible See #10974 Depends on containers/common#831 Signed-off-by: Jhon Honce --- cmd/podman/system/info.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cmd/podman/system/info.go') 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 } -- cgit v1.2.3-54-g00ecf