Skip to content

Change Wrapf of non-error to an actual error#5560

Merged
AkihiroSuda merged 1 commit intocontainerd:masterfrom
estesp:no-error
Jun 3, 2021
Merged

Change Wrapf of non-error to an actual error#5560
AkihiroSuda merged 1 commit intocontainerd:masterfrom
estesp:no-error

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Jun 2, 2021

Fixes: #3974

Per this comment in #3974 there is definitely a problem in that the Wrapf is wrapping a non-error and therefore the return has no error.

Signed-off-by: Phil Estes estesp@amazon.com

Signed-off-by: Phil Estes <estesp@amazon.com>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Jun 2, 2021

Build succeeded.

Copy link
Copy Markdown
Member

@samuelkarp samuelkarp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice find!

LGTM

@AkihiroSuda AkihiroSuda merged commit 308c7b3 into containerd:master Jun 3, 2021
@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Jun 3, 2021

Nice find!

LGTM

wrap nil returns nil ugg... heading off to check all my code bases...

@estesp estesp deleted the no-error branch June 4, 2021 02:11
@estesp estesp added cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch and removed cherry-pick/1.4.x labels Jun 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Failed to pull image (unexpected commit digest)

5 participants