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

Merge pull request #2181 from vrothberg/issue-2159

Browse Source 
podman-inspect: don't ignore errors
This commit is contained in:
OpenShift Merge Robot
2019-01-18 17:33:52 +01:00
committed by GitHub
parent a2ab36d0d1 f1c5b1e912
commit 27de1c19e9
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/podman/formats/formats.go
View File

@ -20,6 +20,8 @@ const (
JSONString = "json" JSONString = "json"
// IDString const to save on duplicates for Go templates // IDString const to save on duplicates for Go templates
IDString = "{{.ID}}" IDString = "{{.ID}}"
parsingErrorStr = "Template parsing error"
) )
// Writer interface for outputs // Writer interface for outputs
@ -96,7 +98,7 @@ func (t StdoutTemplateArray) Out() error {
t.Template = strings.Replace(strings.TrimSpace(t.Template[5:]), " ", "\t", -1) t.Template = strings.Replace(strings.TrimSpace(t.Template[5:]), " ", "\t", -1)
headerTmpl, err := template.New("header").Funcs(headerFunctions).Parse(t.Template) headerTmpl, err := template.New("header").Funcs(headerFunctions).Parse(t.Template)
if err != nil { if err != nil {
return errors.Wrapf(err, "Template parsing error") return errors.Wrapf(err, parsingErrorStr)
} }
err = headerTmpl.Execute(w, t.Fields) err = headerTmpl.Execute(w, t.Fields)
if err != nil { if err != nil {
@ -107,13 +109,12 @@ func (t StdoutTemplateArray) Out() error {
t.Template = strings.Replace(t.Template, " ", "\t", -1) t.Template = strings.Replace(t.Template, " ", "\t", -1)
tmpl, err := template.New("image").Funcs(basicFunctions).Parse(t.Template) tmpl, err := template.New("image").Funcs(basicFunctions).Parse(t.Template)
if err != nil { if err != nil {
return errors.Wrapf(err, "Template parsing error") return errors.Wrapf(err, parsingErrorStr)
} }
for i, img := range t.Output { for i, raw := range t.Output {
basicTmpl := tmpl.Funcs(basicFunctions) basicTmpl := tmpl.Funcs(basicFunctions)
err = basicTmpl.Execute(w, img) if err := basicTmpl.Execute(w, raw); err != nil {
if err != nil { return errors.Wrapf(err, parsingErrorStr)
return err
} }
if i != len(t.Output)-1 { if i != len(t.Output)-1 {
fmt.Fprintln(w, "") fmt.Fprintln(w, "")

6
cmd/podman/inspect.go
View File

@ -87,6 +87,9 @@ func inspectCmd(c *cli.Context) error {
} }
inspectedObjects, iterateErr := iterateInput(getContext(), c, args, runtime, inspectType) inspectedObjects, iterateErr := iterateInput(getContext(), c, args, runtime, inspectType)
if iterateErr != nil {
return iterateErr
}
var out formats.Writer var out formats.Writer
if outputFormat != "" && outputFormat != formats.JSONString { if outputFormat != "" && outputFormat != formats.JSONString {
@ -97,8 +100,7 @@ func inspectCmd(c *cli.Context) error {
out = formats.JSONStructArray{Output: inspectedObjects} out = formats.JSONStructArray{Output: inspectedObjects}
} }
formats.Writer(out).Out() return formats.Writer(out).Out()
return iterateErr
} }
// func iterateInput iterates the images|containers the user has requested and returns the inspect data and error // func iterateInput iterates the images|containers the user has requested and returns the inspect data and error