Repository navigation
Fixed --simulate=diff to show the new target of a replaced symlink - #6438
Open
nickanderson wants to merge 1 commit into
Open
nickanderson wants to merge 1 commit into
nickanderson wants to merge 1 commit into
Conversation
When a symlink in the changes chroot replaced a link with a wrong target or an obstructing file, the diff report read the link from the real filesystem instead of from the changes chroot. A wrong link showed its old target with the first characters cut off, and an obstruction showed "Invalid target" because the original was a regular file. Ticket: ENT-14713 Changelog: Title
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| GetFileTypeDescription(st_chrooted.st_mode)); | ||
| ManifestStatInfo(&st_chrooted); | ||
| ManifestFileDetails(path, &st_chrooted, true); | ||
| ManifestFileDetails(chrooted_path, &st_chrooted, true); |
| printf("'%s' is a %s\n", path, GetFileTypeDescription(st_chrooted.st_mode)); | ||
| ManifestStatInfo(&st_chrooted); | ||
| ManifestFileDetails(path, &st_chrooted, true); | ||
| ManifestFileDetails(chrooted_path, &st_chrooted, true); |
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
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.
With
--simulate=diff, when a symlink replaced a link with a wrong target or an obstructing file, the report read the link from the real filesystem instead of the changes chroot: a wrong link showed its old target with the first characters cut off, and an obstruction showed "Invalid target". It now reads the link from the changes chroot and shows the new target.Ticket: ENT-14713
Tests: new
29_simulate_mode/diff_mode_symlinks.cfcovers both cases; it fails with the fix reverted. Full acceptance, unit (incl. ASAN/UBSan) and static checks pass locally.🤖 Generated with Claude Code