Error on more hash mismatch cases #3653
Closed
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
instead of asserting, show the user what was expected vs. what was handled. This condition is very close to the one right after it, but this one happens when the tree narHash is not equal to input narHash.
Ericson2314
reviewed
Jun 3, 2020
| assert(input->narHash == tree.info.narHash); | ||
| if (input->narHash && input->narHash != tree.info.narHash) | ||
| throw Error("NAR hash mismatch in input '%s' (%s), expected '%s', got '%s'", | ||
| to_string(), tree.actualPath, input->narHash->to_string(SRI), tree.info.narHash.to_string(SRI)); |
There was a problem hiding this comment.
Maybe this should go in Nevermind that is the virtual method.fetchTreeInternal?
There was a problem hiding this comment.
narHash is in a valid attr for all inputs, so I think all of them need to handle this case. it's replacing an assert that was there previously.
|
Example of what happens without this change: |
|
|
|
@edolstra nevermind, I think this is just a good change, and my "why two inputs" questions are orthogonal. |
|
This is fixed on flakes branch. |
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.
instead of asserting, show the user what was expected vs. what was
handled.
This condition is very close to the one right after it, but this one
happens when the tree narHash is not equal to input narHash.