Fix apply
not working for relative paths
#1
Merged
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.
This PR fixes a bug where trying to use
apply
with a relative path to a directory of YAML files causes a panic:The issue is caused here:
macos-defaults/src/cmd/apply.rs
Lines 158 to 163 in 7ec24bc
Calling
entry.path()
gets a complete path to each entry (e.g.data/macos-defaults/accessibility.yaml
), which is then erroneously joined to the path of its parent directory (data/macos-defaults/
), resulting in a non-existent path likedata/macos-defaults/data/macos-defaults/accessibility.yaml
. This incidentally works when the path is absolute, because in that case the new path simply replaces the old one).This PR changes the implementation to avoid improperly appending the string, and function as intended.