saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Manage symlinks after dirs and files

Browse source 
Force symlink on keep_symlinks
This commit is contained in:
twangboy 2024-08-28 12:23:41 -06:00
parent c54a8ced4f
commit 26e31d23d5
No known key found for this signature in database
GPG key ID: ED267D5C0DE6F8A6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/states/file.py
View file

@ -4668,12 +4668,16 @@ def recurse(
name, source, keep_symlinks, include_pat, exclude_pat, maxdepth, include_empty
)
for dirname in mng_dirs:
manage_directory(dirname)
for dest, src in mng_files:
manage_file(dest, src, replace)
for srelpath, ltarget in mng_symlinks:
_ret = symlink(
os.path.join(name, srelpath),
ltarget,
makedirs=True,
force=force_symlinks,
force=force_symlinks or keep_symlinks,
user=user,
group=group,
mode=sym_mode,
@ -4681,10 +4685,6 @@ def recurse(
if not _ret:
continue
merge_ret(os.path.join(name, srelpath), _ret)
for dirname in mng_dirs:
manage_directory(dirname)
for dest, src in mng_files:
manage_file(dest, src, replace)
if clean:
# TODO: Use directory(clean=True) instead