Merge pull request #10688 from jwhonce/bz/1855983

Scrub podman commands to use report package

1 files changed, 6 insertions, 5 deletions

diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go
index 5575fc87d..4502b156c 100644
--- a/cmd/podman/system/version.go
+++ b/cmd/podman/system/version.go
@@ -5,8 +5,6 @@ import (
 	"io"
 	"os"
 	"strings"
-	"text/tabwriter"
-	"text/template"
 
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/report"
@@ -55,19 +53,22 @@ func version(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
+	w, err := report.NewWriterDefault(os.Stdout)
+	if err != nil {
+		return err
+	}
 	defer w.Flush()
 
 	if cmd.Flag("format").Changed {
 		row := report.NormalizeFormat(versionFormat)
-		tmpl, err := template.New("version 2.0.0").Parse(row)
+		tmpl, err := report.NewTemplate("version 2.0.0").Parse(row)
 		if err != nil {
 			return err
 		}
 		if err := tmpl.Execute(w, versions); err != nil {
 			// On Failure, assume user is using older version of podman version --format and check client
 			row = strings.Replace(row, ".Server.", ".", 1)
-			tmpl, err := template.New("version 1.0.0").Parse(row)
+			tmpl, err := report.NewTemplate("version 1.0.0").Parse(row)
 			if err != nil {
 				return err
 			}