containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3610 from rhatdan/pullmsg 

Cleanup Pull Message
This commit is contained in:
OpenShift Merge Robot 2019-07-20 17:05:05 +02:00 committed by GitHub
parent 8364552e10 20302cb65d
commit a5aa44c583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libpod/image/pull.go
View File

@ -240,6 +240,12 @@ func (ir *Runtime) pullImageFromReference(ctx context.Context, srcRef types.Imag
return ir.doPullImage(ctx, sc, *goal, writer, signingOptions, dockerOptions, nil) return ir.doPullImage(ctx, sc, *goal, writer, signingOptions, dockerOptions, nil)
} }
func cleanErrorMessage(err error) string {
errMessage := strings.TrimPrefix(errors.Cause(err).Error(), "errors:\n")
errMessage = strings.Split(errMessage, "\n")[0]
return fmt.Sprintf(" %s\n", errMessage)
}
// doPullImage is an internal helper interpreting pullGoal. Almost everyone should call one of the callers of doPullImage instead. // doPullImage is an internal helper interpreting pullGoal. Almost everyone should call one of the callers of doPullImage instead.
func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goal pullGoal, writer io.Writer, signingOptions SigningOptions, dockerOptions *DockerRegistryOptions, label *string) ([]string, error) { func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goal pullGoal, writer io.Writer, signingOptions SigningOptions, dockerOptions *DockerRegistryOptions, label *string) ([]string, error) {
span, _ := opentracing.StartSpanFromContext(ctx, "doPullImage") span, _ := opentracing.StartSpanFromContext(ctx, "doPullImage")
@ -281,9 +287,9 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa
_, err = cp.Image(ctx, policyContext, imageInfo.dstRef, imageInfo.srcRef, copyOptions) _, err = cp.Image(ctx, policyContext, imageInfo.dstRef, imageInfo.srcRef, copyOptions)
if err != nil { if err != nil {
pullErrors = multierror.Append(pullErrors, err) pullErrors = multierror.Append(pullErrors, err)
logrus.Errorf("Error pulling image ref %s: %v", imageInfo.srcRef.StringWithinTransport(), err) logrus.Debugf("Error pulling image ref %s: %v", imageInfo.srcRef.StringWithinTransport(), err)
if writer != nil { if writer != nil {
_, _ = io.WriteString(writer, "Failed\n") _, _ = io.WriteString(writer, cleanErrorMessage(err))
} }
} else { } else {
if !goal.pullAllPairs { if !goal.pullAllPairs {