Skip to content

CFE-4623: Fix modules_presence to handle findfiles() trailing slash behavior (3.24)#3125

Merged
nickanderson merged 2 commits into
cfengine:3.24.xfrom
nickanderson:CFE-4623/3.24.x
Apr 15, 2026
Merged

CFE-4623: Fix modules_presence to handle findfiles() trailing slash behavior (3.24)#3125
nickanderson merged 2 commits into
cfengine:3.24.xfrom
nickanderson:CFE-4623/3.24.x

Conversation

@nickanderson
Copy link
Copy Markdown
Member

Cherry-pick of #3119 to 3.24.x

Refactors the modules_presence bundle to filter out the vendored sub-directory without regard to whether findfiles() returns trailing slashes or not.

This fixes issues caused by the unstable findfiles() behavior from version 3.21.8 through 3.27.0 where trailing slashes were inconsistently returned for directories.

The goal of this policy is to find any files in modules/packages which are not in modules/packages/vendored and use those instead of the vendored files.

Ticket: CFE-4623
Changelog: none

…dored without regard to trailing slashes

findfiles() behavior was unstable from version 3.21.8 through 3.27.0 and so we needed to refactor this policy to not care whether findfiles() would return directories with trailing slashes or not.
The goal of the policy is to find any files in modules/packages which are not in modules/packages/vendored and use those instead of the vendored files.

Ticket: CFE-4623
Changelog: none
…ed versions and master (or from source if a core PR is mentioned in the description)

Ticket: CFE-4623
Changelog: none
@nickanderson nickanderson merged commit c02deb0 into cfengine:3.24.x Apr 15, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants