Make successful states coherent #3712
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The successful states used in these two places in the code were slightly different. Should they be the same list?
edolstra
reviewed
Jun 17, 2020
src/libstore/filetransfer.cc
Outdated
| @@ -352,8 +354,7 @@ struct curlFileTransfer : public FileTransfer | |||
| if (writeException) | |||
| failEx(writeException); | |||
|
|
|||
| else if (code == CURLE_OK && | |||
| (httpStatus == 200 || httpStatus == 201 || httpStatus == 204 || httpStatus == 206 || httpStatus == 304 || httpStatus == 0 /* other protocol */)) | |||
| else if (code == CURLE_OK && successfulStatuses.find(httpStatus) != successfulStatuses.end()) | |||
There was a problem hiding this comment.
=> successfulStatuses.count(httpStatus)
src/libstore/filetransfer.cc
Outdated
| @@ -72,6 +72,8 @@ struct curlFileTransfer : public FileTransfer | |||
|
|
|||
| curl_off_t writtenToSink = 0; | |||
|
|
|||
| inline static const std::set<long> successfulStatuses; | |||
There was a problem hiding this comment.
This looks like it lacks an initializer?
grahamc
approved these changes
Jun 17, 2020
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The successful states used in these two places in the code were slightly
different. Should they be the same list?