opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 21:07:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7146 from rhatdan/format

Browse Source 
Don't crash when giving bogus format commands
This commit is contained in:
OpenShift Merge Robot
2020-07-30 06:13:51 -04:00
committed by GitHub
parent c66ce8d67f 9917fc0f95
commit 117043040e
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/images/history.go
View File

@ -125,7 +125,10 @@ func history(cmd *cobra.Command, args []string) error {
} }
format := hdr + "{{range . }}" + row + "{{end}}" 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) w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
err = tmpl.Execute(w, hr) err = tmpl.Execute(w, hr)
if err != nil { if err != nil {

6
cmd/podman/images/list.go
View File

@ -168,7 +168,11 @@ func writeTemplate(imgs []imageReporter) error {
} }
} }
format := hdr + "{{range . }}" + row + "{{end}}" 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) w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
defer w.Flush() defer w.Flush()
return tmpl.Execute(w, imgs) return tmpl.Execute(w, imgs)

6
cmd/podman/system/connection/list.go
View File

@ -75,7 +75,11 @@ func list(_ *cobra.Command, _ []string) error {
// TODO: Allow user to override format // TODO: Allow user to override format
format := "{{range . }}{{.Name}}\t{{.Identity}}\t{{.URI}}\n{{end}}" 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) w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
defer w.Flush() defer w.Flush()