Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jun 3, 2021

Conversation

estesp
Copy link
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

theopenlab-ci bot commented Jun 2, 2021

Build succeeded.

Copy link
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
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 added cherry-pick/1.4.x Change to be cherry picked to release/1.4 branch cherry-pick/1.5.x Change to be cherry picked to release/1.5 branch labels Jun 3, 2021
@AkihiroSuda AkihiroSuda merged commit 308c7b3 into containerd:master Jun 3, 2021
@mikebrow
Copy link
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 Change to be cherry picked to release/1.4 branch cherry-pick/1.5.x Change to be cherry picked to release/1.5 branch 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