From 26e31d23d525e3271d54d5f2072ee0324c2f1559 Mon Sep 17 00:00:00 2001
From: twangboy <shane.d.lee@gmail.com>
Date: Wed, 28 Aug 2024 12:23:41 -0600
Subject: [PATCH] Manage symlinks after dirs and files

Force symlink on keep_symlinks
---
 salt/states/file.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/salt/states/file.py b/salt/states/file.py
index 4adf6e12529..04c490e9710 100644
--- a/salt/states/file.py
+++ b/salt/states/file.py
@@ -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