Input: Replace markFileChanged() by putFile()#9239
Merged
edolstra merged 3 commits intoNixOS:masterfrom Oct 31, 2023
Merged
Conversation
Committing a lock file using markFileChanged() required the input to be writable by the caller in the local filesystem (using the path returned by getSourcePath()). putFile() abstracts over this.
Merged
Ericson2314
reviewed
Oct 25, 2023
Member
Ericson2314
left a comment
There was a problem hiding this comment.
The rest looks good to me :)
src/libexpr/flake/flake.cc
Outdated
| auto outputLockFilePath = sourcePath ? std::optional{*sourcePath + "/" + relPath} : std::nullopt; | ||
|
|
||
| newLockFile.write(*outputLockFilePath); | ||
| bool lockFileExists = pathExists(*outputLockFilePath); |
Member
There was a problem hiding this comment.
This will crash if the previous line set std::nullopt right?
looking further up I think that is impossible because the new if (sourcePath || lockFlags.outputLockFilePath) and then lockFlags.outputLockFilePath right? but in that case we should assert(sourcePath); in this branch and then get rid of the sourcePath ? ....
Member
Author
There was a problem hiding this comment.
Thanks, I've cleaned this up.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
Committing a lock file using
markFileChanged()required the input to be writable by the caller in the local filesystem (using the path returned bygetSourcePath()).putFile()abstracts over this.Extracted from lazy-trees (which removes
getSourcePath()entirely).Context
Priorities
Add 👍 to pull requests you find important.