Fix: Flatten layer function needs to return existing files in the layer correctly #2057
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
gabyx
changed the title
gabyx
commented
Apr 20, 2022
| basename := filepath.Base(p) | ||
| if strings.HasPrefix(basename, archive.WhiteoutPrefix) { | ||
| deletedFile := filepath.Join(filepath.Dir(p), strings.TrimPrefix(basename, archive.WhiteoutPrefix)) | ||
| delete(paths, deletedFile) |
There was a problem hiding this comment.
Here I delete the corresponding file, also .wh. prefixed files never enter the paths map.
imjasonh
approved these changes
Apr 25, 2022
imjasonh
approved these changes
Apr 26, 2022
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.
Fixes #1420 and also probably fixes: #1944
Description
The
getFlattenedPathsForWhiteoutfunction was kind os suspicous and definitely not correct. It reports.wh.prefixed files as existing, which IMO should not be included. Since: This function should IMO return the list of existing paths in the layer, since its only used in this context inutils.WalkFS. This probably causes also the existence of.wh.wh....in layers...Submitter Checklist
These are the criteria that every PR should meet, please check them off as you
review them:
Triggering these bugs above is really hard. If I have time I will try to test it.
See the contribution guide for more details.
Reviewer Notes
Release Notes
Describe any changes here so maintainer can include it in the release notes, or delete this block.