common-updater-scripts: Handle errors in src hashing #80562
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
NeQuissimus
approved these changes
Feb 19, 2020
|
Woohoo! I've accidentally committed (and then had to fixup) |
Previously, when downloading src failed for other reason than hash mismatch, the error ended up in newHash. This made evaluation fail since the error message is not valid hash. Now the failure will make newHash empty. It is also much cleaner than previously since \K is very cool thing and we no longer grep for legacy messages.
SRI hashes (base64 encoded) can contain + sign which is a special character in extended regular expressions so it needs to be escaped.
|
I accidentally made it include SRI-like prefix even when the SRI hash was not previously used. That should be fixed now. I also fixed the issue when SRI hashes containing |
NeQuissimus
approved these changes
Feb 20, 2020
dtzWill
pushed a commit
to dtzWill/nixpkgs
that referenced
this pull request
Feb 21, 2020
common-updater-scripts: Handle errors in src hashing (cherry picked from commit cf366dd)
10 tasks
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.
Motivation for this change
Previously, when downloading src failed for other reason than hash mismatch, the error ended up in newHash. This made evaluation fail since the error message is not valid hash. Now the failure will make newHash empty.
It is also much cleaner than previously since \K is very cool thing and we no longer grep for legacy messages.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)