-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(PUP-11788) Account for JRuby behavior in Dir.glob
JRuby does not properly match both directory and file wildcards when using Dir.glob (e.g. Dir.glob('**/*.pp'), which can lead to incorrect matches. Because of this, if a manifest name contains ".pp" in its filename (e.g. foo.pp.pp), Puppet does not recognize it as a manifest file when importing and parsing manifests. This commit updates the perform_initial_import method to no longer rely on that wildcard Dir.glob behavior to recursively traverse a directory and instead uses only the directory wildcard and uses Array.select to identify files ending in ".pp" from there. (cherry picked from commit 663062a)
- Loading branch information
1 parent
d835ef6
commit 10d219a
Showing
2 changed files
with
21 additions
and
4 deletions.
There are no files selected for viewing
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
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