Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow file.recurse to merge all existing source dirs #67073

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

lkubb
Copy link
Contributor

@lkubb lkubb commented Nov 27, 2024

What does this PR do?

Adds a merge parameter to file.recurse. When enabled, instead of selecting the first existing source, merges source directories recursively.

What issues does this PR fix or reference?

Fixes: #67072
Fixes: #67766

Previous Behavior

Selects the first source only.

New Behavior

Can merge multiple sources.

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

@lkubb lkubb force-pushed the feat/file-recurse-merge-sources branch from 07feb8a to 1d9a12f Compare February 20, 2025 00:30
@lkubb lkubb marked this pull request as ready for review February 20, 2025 00:37
@lkubb lkubb requested a review from a team as a code owner February 20, 2025 00:37
@lkubb lkubb force-pushed the feat/file-recurse-merge-sources branch from 1d9a12f to 62b869f Compare February 20, 2025 10:48
@lkubb lkubb force-pushed the feat/file-recurse-merge-sources branch from 62b869f to 9b41fa7 Compare February 20, 2025 11:02
@lkubb lkubb force-pushed the feat/file-recurse-merge-sources branch from 9b41fa7 to 8193adf Compare February 20, 2025 15:20
@lkubb lkubb force-pushed the feat/file-recurse-merge-sources branch from 8193adf to c475e30 Compare February 20, 2025 16:07
@lkubb lkubb force-pushed the feat/file-recurse-merge-sources branch from ff5b6e5 to 17b92d7 Compare February 21, 2025 09:10
@lkubb lkubb force-pushed the feat/file-recurse-merge-sources branch from cb10fa1 to 1091a7a Compare February 22, 2025 15:37
@lkubb lkubb force-pushed the feat/file-recurse-merge-sources branch from 1091a7a to 33779e0 Compare February 24, 2025 11:22
@lkubb lkubb force-pushed the feat/file-recurse-merge-sources branch from 33779e0 to 2a6d1bc Compare February 24, 2025 11:23
@lkubb lkubb force-pushed the feat/file-recurse-merge-sources branch from 2a6d1bc to 219fac8 Compare February 24, 2025 13:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Windows symlink handling [FEATURE REQUEST] file.recurse: allow merging directories from source list
2 participants