change hash algorithm computation method #3
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
leonklingele
reviewed
Mar 9, 2024
| @@ -1,3 +1,5 @@ | |||
| module git.helsinki.tools/helsinki-systems/wp4nix | |||
|
|
|||
| go 1.16 | |||
|
|
|||
| require github.com/nix-community/go-nix v0.0.0-20231219074122-93cb24a86856 // indirect | |||
There was a problem hiding this comment.
This shouldn't be an indirect dependency. Can you please run go get -u ; go mod tidy and push the changes? 😊
leonklingele
reviewed
Mar 9, 2024
| func svnPrefetch(repo *Repository, path string, rev string, rawName string) (string, error) { | ||
| h := sha256.New() |
There was a problem hiding this comment.
Move this down to after line 93 (inside the if err == nil.
leonklingele
requested changes
Mar 9, 2024
| // people push some weird shit | ||
| reg, _ := regexp.Compile("[^a-zA-Z0-9+\\-._?=]+") | ||
| fixedName := reg.ReplaceAllString(rawName, "") | ||
| dir, _ := ioutil.TempDir("", "wp4nix-prefetch-") | ||
| defer os.RemoveAll(dir) | ||
| var err error | ||
| var resp string | ||
| var hashString string |
Comment on lines
+87
to
+88
| nar.DumpPath(h, filepath.Join(dir, fixedName)) | ||
| hashString = nixbase32.EncodeToString(h.Sum(nil)) |
There was a problem hiding this comment.
Suggested change
| nar.DumpPath(h, filepath.Join(dir, fixedName)) | |
| hashString = nixbase32.EncodeToString(h.Sum(nil)) | |
| if err := nar.DumpPath(h, filepath.Join(dir, fixedName)); err != nil { | |
| return "", fmt.Errorf("failed to dump path: %w", err) | |
| } | |
| return nixbase32.EncodeToString(h.Sum(nil)), nil |
| } | ||
| return resp, err | ||
| return hashString, err |
There was a problem hiding this comment.
Suggested change
| return hashString, err | |
| return "", err |
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 using os.exec to execute nix-hash, this method uses a native go module for hash computation