summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-30 06:13:51 -0400
committerGitHub <noreply@github.com>2020-07-30 06:13:51 -0400
commit117043040e18e473f3b2142576303349238a36a7 (patch)
treefbb26cab3ae5aefeb7beb896f68289267bc3a478
parentc66ce8d67f9eb53a0997da39999ed8629d3252e3 (diff)
parent9917fc0f956c849ec2d52f3f873aa6eaa3f25e72 (diff)
downloadpodman-117043040e18e473f3b2142576303349238a36a7.tar.gz
podman-117043040e18e473f3b2142576303349238a36a7.tar.bz2
podman-117043040e18e473f3b2142576303349238a36a7.zip
Merge pull request #7146 from rhatdan/format
Don't crash when giving bogus format commands
-rw-r--r--cmd/podman/images/history.go5
-rw-r--r--cmd/podman/images/list.go6
-rw-r--r--cmd/podman/system/connection/list.go6
3 files changed, 14 insertions, 3 deletions
diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go
index ef5b4be26..f3a41f6b9 100644
--- a/cmd/podman/images/history.go
+++ b/cmd/podman/images/history.go
@@ -125,7 +125,10 @@ func history(cmd *cobra.Command, args []string) error {
}
format := hdr + "{{range . }}" + row + "{{end}}"
- tmpl := template.Must(template.New("report").Parse(format))
+ tmpl, err := template.New("report").Parse(format)
+ if err != nil {
+ return err
+ }
w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
err = tmpl.Execute(w, hr)
if err != nil {
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index 4552901f7..ee0f64d99 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -168,7 +168,11 @@ func writeTemplate(imgs []imageReporter) error {
}
}
format := hdr + "{{range . }}" + row + "{{end}}"
- tmpl := template.Must(template.New("list").Parse(format))
+ tmpl, err := template.New("list").Parse(format)
+ if err != nil {
+ return err
+ }
+ tmpl = template.Must(tmpl, nil)
w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
defer w.Flush()
return tmpl.Execute(w, imgs)
diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go
index 6d3d85d11..9010ec803 100644
--- a/cmd/podman/system/connection/list.go
+++ b/cmd/podman/system/connection/list.go
@@ -75,7 +75,11 @@ func list(_ *cobra.Command, _ []string) error {
// TODO: Allow user to override format
format := "{{range . }}{{.Name}}\t{{.Identity}}\t{{.URI}}\n{{end}}"
- tmpl := template.Must(template.New("connection").Parse(format))
+ tmpl, err := template.New("connection").Parse(format)
+ if err != nil {
+ return err
+ }
+
w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
defer w.Flush()