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.

Sign up for GitHub

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

Jump to bottom

When handling errors in storageHandler check underlying error #13178

Merged
merged 2 commits into from
Oct 18, 2020
Merged

When handling errors in storageHandler check underlying error #13178

merged 2 commits into from
Oct 18, 2020

Conversation

zeripath
Copy link
Contributor

Unfortunately there was a mistake in #13164 which fails to handle
os.PathError wrapping an os.ErrNotExist

Signed-off-by: Andrew Thornton art27@cantab.net

@zeripath
When handling errors in storageHandler check underlying error
2ec8a7e 
Unfortunately there was a mistake in go-gitea#13164 which fails to handle
os.PathError wrapping an os.ErrNotExist

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.14.0 milestone Oct 16, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 17, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 18, 2020
@codecov-io
Copy link

Codecov Report

Merging #13178 into master will increase coverage by 0.01%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13178      +/-   ##
==========================================
+ Coverage   42.01%   42.02%   +0.01%     
==========================================
  Files         683      683              
  Lines       75215    75215              
==========================================
+ Hits        31602    31611       +9     
+ Misses      38448    38439       -9     
  Partials     5165     5165
Impacted Files Coverage Δ
modules/storage/minio.go 1.81% <0.00%> (ø)
routers/routes/routes.go 84.87% <0.00%> (ø)
services/pull/pull.go 40.78% <0.00%> (-0.50%) ⬇️
models/gpg_key.go 53.90% <0.00%> (+0.57%) ⬆️
routers/repo/view.go 38.11% <0.00%> (+0.64%) ⬆️
services/pull/check.go 52.55% <0.00%> (+0.72%) ⬆️
modules/log/file.go 75.20% <0.00%> (+1.60%) ⬆️
models/unit.go 49.31% <0.00%> (+2.73%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4cc8697...b20648f. Read the comment docs.

@techknowlogick techknowlogick merged commit 25b7766 into go-gitea:master Oct 18, 2020
techknowlogick added a commit to techknowlogick/gitea that referenced this pull request Oct 18, 2020
@zeripath @techknowlogick
When handling errors in storageHandler check underlying error (go-git…
6876fd6 
…ea#13178)

Unfortunately there was a mistake in go-gitea#13164 which fails to handle
os.PathError wrapping an os.ErrNotExist

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
zeripath added a commit that referenced this pull request Oct 18, 2020
@techknowlogick @zeripath
When handling errors in storageHandler check underlying error (#13178) (
aca13f9 
#13193)

Unfortunately there was a mistake in #13164 which fails to handle
os.PathError wrapping an os.ErrNotExist

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: zeripath <art27@cantab.net>
@zeripath zeripath deleted the fix-13164-handle-404s-properly branch October 25, 2020 13:12
@zeripath
Copy link
Contributor Author

Backport included in #13193

@zeripath zeripath added the backport/done All backports for this PR have been created label Oct 25, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@techknowlogick techknowlogick techknowlogick approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.
5 participants
@zeripath @codecov-io @lunny @techknowlogick @GiteaBot