Skip recycle bin and part fix for moby/moby 32838 #154
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
jstarks
requested changes
Jan 3, 2018
legacy.go
Outdated
| // UTF16 to UTF8 in files which are left in the recycle bin. Os.Lstat | ||
| // which is called by filepath.Walk will fail when a filename contains | ||
| // unicode characters. | ||
| if strings.Contains(err.Error(), syscall.Errno(syscall.ERROR_FILE_NOT_FOUND).Error()) && |
There was a problem hiding this comment.
Can we just skip walking Files\$Recycle.Bin altogether? I can't see why a user would ever want to commit the recycle bin directory.
There was a problem hiding this comment.
Specifically I think you just want to return filepath.SkipDir for that directory so that it doesn't even try to enumerate those files.
There was a problem hiding this comment.
I didn't know that existed. Will take a look, would make a simpler fix certainly.
Signed-off-by: John Howard <jhoward@microsoft.com>
lowenna
force-pushed
the
moby-partfix-32838
branch
from
79e49ec to
0d5bb78
Compare
|
@jstarks Updated and verified it fixes the reported issue. |
jstarks
approved these changes
Jan 3, 2018
darstahl
approved these changes
Jan 3, 2018
dcantah
pushed a commit
to dcantah/hcsshim
that referenced
this pull request
Mar 17, 2021
Add sigusr1 debugging to client
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Signed-off-by: John Howard jhoward@microsoft.com
Changes the
legacyLayerReaderto skip the recycle bin. In addition, it skips files which are in the recycle bin which have Unicode characters which appear to have lost fidelity between UTF16 and UTF8 conversion. See moby/moby#32838 (comment) for the dockerfile which causes this problem.@jstarks @darrenstahlmsft PTAL