Repository navigation
Fixed --simulate=diff and --simulate symlink reporting (3.24) - #6444
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 PR! Maybe @craigcomstock can review this? |
nickanderson
changed the title
|
@cf-bottom jenkins, please |
|
Sure, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/14887/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-14887/ |
|
I don't think the macos failure is related to this. OK to merge? |
|
@cf-bottom Jenkins with exotics please :) |
|
Alright, I triggered a build: (with exotics) Jenkins: https://ci.cfengine.com/job/pr-pipeline/14917/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-14917/ |
|
@cf-bottom Jenkins with exotics please :) |
|
Sure, I triggered a build: (with exotics) Jenkins: https://ci.cfengine.com/job/pr-pipeline/14957/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-14957/ |
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)
58244a2 to
c275824
Compare
|
@cf-bottom Jenkins with exotics please :) |
|
Alright, I triggered a build: (with exotics) Jenkins: https://ci.cfengine.com/job/pr-pipeline/14966/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-14966/ |
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)The new tests include
../default.cf.sub, which is whatdefault.sub.cfis called on 3.24.x.Tickets: ENT-14694, ENT-14713, ENT-14714