Merge pull request #1306 from douglasjacobsen/copy-deref-symlinks

Update stage methods to dereference links

Author: douglasjacobsen

lib/ramble/ramble/language/application_language.py

@@ -483,13 +483,13 @@ def _execute_stage_files(app):
 
         # Prepare the core staging command
         if stage_method == "rsync":
-            stage_cmd = f"rsync -r {src} {dst}"
+            stage_cmd = f"rsync -Lr {src} {dst}"
         elif stage_method == "hard_link":
             stage_cmd = f"ln {src} {dst}"
         elif stage_method == "symbolic_link":
             stage_cmd = f"ln -s {src} {dst}"
         else:  # stage_method == "cp"
-            stage_cmd = f"cp -r {src} {dst}"
+            stage_cmd = f"cp -Lr {src} {dst}"
 
         template = [stage_cmd]
 

lib/ramble/ramble/test/application_language.py

@@ -397,8 +397,8 @@ class BrokenWorkloadDefaults(ExecutableApplication):  # noqa: F405
 @pytest.mark.parametrize(
     "stage_method,template_contents",
     [
-        ("cp", "cp -r src"),
-        ("rsync", "rsync -r src"),
+        ("cp", "cp -Lr src"),
+        ("rsync", "rsync -Lr src"),
         ("symbolic_link", "ln -s src"),
         ("hard_link", "ln src"),
     ],