Repository navigation
Fixed --simulate=diff and --simulate symlink reporting (3.27) - #6443
Open
nickanderson wants to merge 3 commits into
Open
nickanderson wants to merge 3 commits into
nickanderson wants to merge 3 commits into
Conversation
The diff report only ran 'diff -u' on file contents, so a file whose mode, owner or group changed without its contents was listed with nothing under it. Permission, owner and group changes are now printed before the content diff. Ticket: ENT-14694 Changelog: Title (cherry picked from commit e55f9d8)
|
Thank you for submitting a pull request! Maybe @craigcomstock can review this? |
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 (cherry picked from commit 8d6bc9c)
… path Symlinks mirrored into the changes chroot point into the chroot, so the "points to ... not ..." messages for a link with a wrong target showed the internal '<workdir>/state/<pid>.changes/...' path instead of the target on the real filesystem. Ticket: ENT-14714 Changelog: Title (cherry picked from commit bfb47d7)
nickanderson
changed the title
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.
Cherry-picks of the
--simulatefixes from master:--simulate=diffreports permission and ownership changes (ENT-14694)--simulate=diffshows the new target of a replaced symlink (ENT-14713)--simulatesymlink errors show the real target, not a chroot path (ENT-14714)Tickets: ENT-14694, ENT-14713, ENT-14714