fix(pkg): lock subdirectories#14524
Merged
Merged
Conversation
Alizter
force-pushed
the
push-skkwmnoyzwpp
branch
2 times, most recently
from
76b02c9 to
73efa2d
Compare
Collaborator
|
#14522 is merged, can you rebase to see just the fix in the cram test diff? |
Signed-off-by: Ali Caglayan <alizter@gmail.com>
Alizter
force-pushed
the
push-skkwmnoyzwpp
branch
from
73efa2d to
a778e5b
Compare
Leonidas-from-XIV
previously requested changes
May 14, 2026
Collaborator
Leonidas-from-XIV
left a comment
Leonidas-from-XIV
left a comment
There was a problem hiding this comment.
Looks pretty good, one clarification missing and then its good to go.
shonfeder
approved these changes
May 15, 2026
Leonidas-from-XIV
dismissed
their stale review
Not worth blocking over what is basically a preference in readability.
Leonidas-from-XIV
approved these changes
May 15, 2026
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
3 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.
Fixes #14523.
Two places assumed single-segment lock_dir paths:
Lock_rules.setup_rulesonly handledcomponents = [".lock"]and fell through to empty rules for deeper paths. Adds a".lock" :: _ :: _arm that returnsredirect_to_parent, mirroring the patternPkg_rulesuses for.pkg/<digest>sub-paths.Workspace.source_path_of_lock_dir_pathonly matched a 4-component build path; generalised to any_ :: _ :: ".lock" :: (_ :: _ as segs).Builds on #14522.